/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_version.py

  • Committer: Jelmer Vernooij
  • Date: 2020-02-07 02:14:30 UTC
  • mto: This revision was merged to the branch mainline in revision 7492.
  • Revision ID: jelmer@jelmer.uk-20200207021430-m49iq3x4x8xlib6x
Drop python2 support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_version.py
21
21
 
22
22
import breezy
23
23
from breezy import osutils, trace
24
 
from breezy.sixish import PY3
25
24
from breezy.tests import (
26
25
    probe_unicode_in_user_encoding,
27
26
    TestCase,
96
95
            raise TestSkipped('Cannot find a unicode character that works in'
97
96
                              ' encoding %s' % (osutils.get_user_encoding(),))
98
97
 
99
 
        if PY3:
100
 
            self.overrideEnv('BRZ_HOME', uni_val)
101
 
        else:
102
 
            self.overrideEnv('BRZ_HOME', str_val)
 
98
        self.overrideEnv('BRZ_HOME', uni_val)
103
99
        self.permit_source_tree_branch_repo()
104
100
        out = self.run_bzr_raw("version")[0]
105
101
        self.assertTrue(len(out) > 0)
147
143
                "Test string %r unrepresentable in user encoding %s" % (
148
144
                    uni_val, enc))
149
145
        brz_log = os.path.join(self.test_base_dir, uni_val)
150
 
        if PY3:
151
 
            self.overrideEnv("BRZ_LOG", brz_log)
152
 
        else:
153
 
            self.overrideEnv("BRZ_LOG", brz_log.encode(enc))
 
146
        self.overrideEnv("BRZ_LOG", brz_log)
154
147
        out, err = self.run_bzr_subprocess("version")
155
148
        uni_out = out.decode(enc)
156
149
        self.assertContainsRe(uni_out, u"(?m)^  Breezy log file: .*/\xa7$")