/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

merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_diff.py
1504
1504
        self.assertContainsRe(old_path, 'old/oldname$')
1505
1505
        self.assertEqual(315532800, os.stat(old_path).st_mtime)
1506
1506
        self.assertContainsRe(new_path, 'tree/newname$')
1507
 
        self.assertFileEqual('oldcontent', old_path)
1508
 
        self.assertFileEqual('newcontent', new_path)
 
1507
        self.assertFileEqual(b'oldcontent', old_path)
 
1508
        self.assertFileEqual(b'newcontent', new_path)
1509
1509
        if osutils.host_os_dereferences_symlinks():
1510
1510
            self.assertTrue(os.path.samefile('tree/newname', new_path))
1511
1511
        # make sure we can create files with the same parent directories