/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/blackbox/test_log.py

  • Committer: Jelmer Vernooij
  • Date: 2020-07-05 12:50:01 UTC
  • mfrom: (7490.40.46 work)
  • mto: (7490.40.48 work)
  • mto: This revision was merged to the branch mainline in revision 7519.
  • Revision ID: jelmer@jelmer.uk-20200705125001-7s3vo0p55szbbws7
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_log.py
17
17
 
18
18
"""Black-box tests for brz log."""
19
19
 
 
20
from __future__ import absolute_import
 
21
 
20
22
 
21
23
import os
22
24
 
27
29
    osutils,
28
30
    tests,
29
31
    )
 
32
from breezy.sixish import PY3
30
33
from breezy.tests import (
31
34
    test_log,
32
35
    features,
781
784
            out, err = brz('log', encoding=encoding)
782
785
            if not fail:
783
786
                # Make sure we wrote mu as we expected it to exist
784
 
                self.assertNotEqual(-1, out.find(self._message))
 
787
                if not PY3:
 
788
                    self.assertNotEqual(-1, out.find(encoded_msg))
 
789
                    out_unicode = out.decode(encoding)
 
790
                else:
 
791
                    out_unicode = out
 
792
                self.assertNotEqual(-1, out_unicode.find(self._message))
785
793
            else:
786
794
                self.assertNotEqual(-1, out.find('Message with ?'))
787
795
        finally: