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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-03 01:51:19 UTC
  • mfrom: (6973.14.14 python3-m)
  • Revision ID: breezy.the.bot@gmail.com-20180703015119-8wqoc0wqw45irl6r
Fix more tests on Python3.

Merged from https://code.launchpad.net/~jelmer/brz/python3-m/+merge/348800

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_diff.py
93
93
        # There was an error in error reporting for this option
94
94
        out, err = self.run_bzr('diff --prefix old/', retcode=3)
95
95
        self.assertContainsRe(err,
96
 
            '--prefix expects two values separated by a colon')
 
96
            b'--prefix expects two values separated by a colon')
97
97
 
98
98
    def test_diff_p1(self):
99
99
        """diff -p1 produces lkml-style diffs"""
150
150
    def test_diff_nonexistent_dotted_revision(self):
151
151
        out, err = self.run_bzr('diff -r 1.1', retcode=3)
152
152
        self.assertContainsRe(err,
153
 
            "Requested revision: '1.1' does not exist in branch:")
 
153
            b"Requested revision: '1.1' does not exist in branch:")
154
154
 
155
155
    def test_diff_nonexistent_dotted_revision_change(self):
156
156
        out, err = self.run_bzr('diff -c 1.1', retcode=3)
157
157
        self.assertContainsRe(err,
158
 
            "Requested revision: '1.1' does not exist in branch:")
 
158
            b"Requested revision: '1.1' does not exist in branch:")
159
159
 
160
160
    def test_diff_unversioned(self):
161
161
        # Get an error when diffing a non-versioned file.
163
163
        self.make_example_branch()
164
164
        self.build_tree(['unversioned-file'])
165
165
        out, err = self.run_bzr('diff unversioned-file', retcode=3)
166
 
        self.assertContainsRe(err, 'not versioned.*unversioned-file')
 
166
        self.assertContainsRe(err, b'not versioned.*unversioned-file')
167
167
 
168
168
    # TODO: What should diff say for a file deleted in working tree?
169
169