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

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 15:47:10 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708154710-zebexq602tcer8hv
Fix more merge tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_diff.py
1493
1493
        self.addCleanup(diff_obj.finish)
1494
1494
        self.assertContainsRe(diff_obj._root, 'brz-diff-[^/]*')
1495
1495
        old_path, new_path = diff_obj._prepare_files(
1496
 
                'oldname', 'newname', file_id='file-id')
 
1496
                'oldname', 'newname', file_id=b'file-id')
1497
1497
        self.assertContainsRe(old_path, 'old/oldname$')
1498
1498
        self.assertEqual(315532800, os.stat(old_path).st_mtime)
1499
1499
        self.assertContainsRe(new_path, 'tree/newname$')
1500
 
        self.assertFileEqual('oldcontent', old_path)
1501
 
        self.assertFileEqual('newcontent', new_path)
 
1500
        self.assertFileEqual(b'oldcontent', old_path)
 
1501
        self.assertFileEqual(b'newcontent', new_path)
1502
1502
        if osutils.host_os_dereferences_symlinks():
1503
1503
            self.assertTrue(os.path.samefile('tree/newname', new_path))
1504
1504
        # make sure we can create files with the same parent directories
1505
 
        diff_obj._prepare_files('oldname2', 'newname2', file_id='file2-id')
 
1505
        diff_obj._prepare_files('oldname2', 'newname2', file_id=b'file2-id')
1506
1506
 
1507
1507
 
1508
1508
class TestDiffFromToolEncodedFilename(tests.TestCaseWithTransport):