/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: 2019-03-04 00:16:27 UTC
  • mfrom: (7293 work)
  • mto: This revision was merged to the branch mainline in revision 7318.
  • Revision ID: jelmer@jelmer.uk-20190304001627-v6u7o6pf97tukhek
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
51
51
        out = self.run_bzr("version")[0]
52
52
        self.assertTrue(len(out) > 0)
53
53
        self.assertEqualDiff(out.splitlines()[0],
54
 
            "Breezy (brz) %s" % breezy.__version__)
 
54
                             "Breezy (brz) %s" % breezy.__version__)
55
55
        self.assertContainsRe(out, r"(?m)^  Python interpreter:")
56
56
        self.assertContainsRe(out, r"(?m)^  Python standard library:")
57
57
        self.assertContainsRe(out, r"(?m)^  breezy:")
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.encode('ascii'))
 
118
        self.assertContainsRe(
 
119
            out, br"(?m)^  Breezy log file: " + brz_log.encode('ascii'))
119
120
        self.assertPathDoesNotExist(default_log)
120
121
        self.assertPathExists(brz_log)
121
122
 
131
132
        self.assertPathDoesNotExist(default_log)
132
133
        out = self.run_bzr_subprocess('version')[0]
133
134
        self.assertTrue(len(out) > 0)
134
 
        self.assertContainsRe(out, br"(?m)^  Breezy log file: " + brz_log.encode('ascii'))
 
135
        self.assertContainsRe(
 
136
            out, br"(?m)^  Breezy log file: " + brz_log.encode('ascii'))
135
137
        self.assertPathDoesNotExist(default_log)
136
138
 
137
139
    def test_unicode_brz_log(self):
142
144
        except UnicodeEncodeError:
143
145
            self.skipTest(
144
146
                "Test string %r unrepresentable in user encoding %s" % (
145
 
                uni_val, enc))
 
147
                    uni_val, enc))
146
148
        self.overrideEnv('BRZ_HOME', self.test_base_dir)
147
149
        brz_log = os.path.join(self.test_base_dir, uni_val)
148
150
        if PY3: