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

  • Committer: Jelmer Vernooij
  • Date: 2018-06-22 00:52:45 UTC
  • mfrom: (6973.7.4 python3-f)
  • Revision ID: jelmer@jelmer.uk-20180622005245-0q92vv00fy9ouyqv
Merge lp:~jelmer/brz/python3-f

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_transform.py
2347
2347
        rev = tt.commit(branch, 'message')
2348
2348
        tree = branch.basis_tree()
2349
2349
        self.assertEqual('file', tree.id2path(b'file-id'))
2350
 
        self.assertEqual('contents', tree.get_file_text('file', b'file-id'))
 
2350
        self.assertEqual(b'contents', tree.get_file_text('file', b'file-id'))
2351
2351
        self.assertEqual('dir', tree.id2path(b'dir-id'))
2352
2352
        if SymlinkFeature.available():
2353
2353
            self.assertEqual('dir/symlink', tree.id2path(b'symlink-id'))
3242
3242
        self.addCleanup(tt.finalize)
3243
3243
        final_tree = tt.get_preview_tree()
3244
3244
        self.assertEqual(
3245
 
                'a\nb\nc\n',
 
3245
                b'a\nb\nc\n',
3246
3246
                final_tree.get_file_text(final_tree.id2path(b'file-id')))
3247
3247
 
3248
3248
    def test_merge_preview_into_workingtree(self):
3317
3317
        builder.finish_inventory()
3318
3318
        rev2_id = builder.commit('rev2')
3319
3319
        rev2_tree = tree.branch.repository.revision_tree(rev2_id)
3320
 
        self.assertEqual('contents', rev2_tree.get_file_text('file'))
 
3320
        self.assertEqual(b'contents', rev2_tree.get_file_text('file'))
3321
3321
 
3322
3322
    def test_ascii_limbo_paths(self):
3323
3323
        self.requireFeature(features.UnicodeFilenameFeature)