/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: 2018-08-21 19:28:52 UTC
  • mfrom: (7078 work)
  • mto: This revision was merged to the branch mainline in revision 7101.
  • Revision ID: jelmer@jelmer.uk-20180821192852-ipy6m8q95bbst223
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_version.py
101
101
        else:
102
102
            self.overrideEnv('BRZ_HOME', str_val)
103
103
        self.permit_source_tree_branch_repo()
104
 
        out = self.run_bzr("version")[0]
 
104
        out = self.run_bzr_raw("version")[0]
105
105
        self.assertTrue(len(out) > 0)
106
 
        self.assertContainsRe(out, r"(?m)^  Breezy configuration: " + str_val)
 
106
        self.assertContainsRe(out, br"(?m)^  Breezy configuration: " + str_val)
107
107
 
108
108
 
109
109
class TestVersionBzrLogLocation(TestCaseInTempDir):
115
115
        self.assertPathDoesNotExist([default_log, brz_log])
116
116
        out = self.run_bzr_subprocess('version')[0]
117
117
        self.assertTrue(len(out) > 0)
118
 
        self.assertContainsRe(out, br"(?m)^  Breezy log file: " + brz_log)
 
118
        self.assertContainsRe(out, br"(?m)^  Breezy log file: " + brz_log.encode('ascii'))
119
119
        self.assertPathDoesNotExist(default_log)
120
120
        self.assertPathExists(brz_log)
121
121
 
131
131
        self.assertPathDoesNotExist(default_log)
132
132
        out = self.run_bzr_subprocess('version')[0]
133
133
        self.assertTrue(len(out) > 0)
134
 
        self.assertContainsRe(out, br"(?m)^  Breezy log file: " + brz_log)
 
134
        self.assertContainsRe(out, br"(?m)^  Breezy log file: " + brz_log.encode('ascii'))
135
135
        self.assertPathDoesNotExist(default_log)
136
136
 
137
137
    def test_unicode_brz_log(self):
144
144
                "Test string %r unrepresentable in user encoding %s" % (
145
145
                uni_val, enc))
146
146
        self.overrideEnv('BRZ_HOME', self.test_base_dir)
147
 
        self.overrideEnv("BRZ_LOG",
148
 
            os.path.join(self.test_base_dir, uni_val).encode(enc))
 
147
        brz_log = os.path.join(self.test_base_dir, uni_val)
 
148
        if PY3:
 
149
            self.overrideEnv("BRZ_LOG", brz_log)
 
150
        else:
 
151
            self.overrideEnv("BRZ_LOG", brz_log.encode(enc))
149
152
        out, err = self.run_bzr_subprocess("version")
150
153
        uni_out = out.decode(enc)
151
154
        self.assertContainsRe(uni_out, u"(?m)^  Breezy log file: .*/\xa7$")