/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-17 09:43:24 UTC
  • mfrom: (7045.1.9 python3-o)
  • Revision ID: breezy.the.bot@gmail.com-20180717094324-sejdvmx3kha2zeq8
Fix another ~500 tests on Python 3.

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_diff.py
394
394
            retcode=None)
395
395
        if b'Diff is not installed on this machine' in err:
396
396
            raise tests.TestSkipped("No external 'diff' is available")
397
 
        self.assertEqual('', err)
 
397
        self.assertEqual(b'', err)
398
398
        # We have to skip the stuff in the middle, because it depends
399
399
        # on time.time()
400
400
        self.assertStartsWith(
401
401
            out,
402
 
            "=== added file 'goodbye'\n"
403
 
            "--- old/goodbye\t1970-01-01 00:00:00 +0000\n"
404
 
            "+++ new/goodbye\t")
405
 
        self.assertEndsWith(out, "\n@@ -0,0 +1 @@\n"
406
 
                                 "+baz\n\n")
 
402
            b"=== added file 'goodbye'\n"
 
403
            b"--- old/goodbye\t1970-01-01 00:00:00 +0000\n"
 
404
            b"+++ new/goodbye\t")
 
405
        self.assertEndsWith(out, b"\n@@ -0,0 +1 @@\n"
 
406
                                 b"+baz\n\n")
407
407
 
408
408
    def test_external_diff_options_and_using(self):
409
409
        """Test that the options are passed correctly to an external diff process"""