/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/plugins/git/tests/test_workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-01 21:13:21 UTC
  • mto: This revision was merged to the branch mainline in revision 7027.
  • Revision ID: jelmer@jelmer.uk-20180701211321-dazu15ry3tcvny2l
Fix some git tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/tests/test_workingtree.py
64
64
        self.build_tree(['conflicted'])
65
65
        self.tree.add(['conflicted'])
66
66
        with self.tree.lock_tree_write():
67
 
            self.tree.index['conflicted'] = self.tree.index['conflicted'][:9] + (FLAG_STAGEMASK, )
 
67
            self.tree.index[b'conflicted'] = self.tree.index[b'conflicted'][:9] + (FLAG_STAGEMASK, )
68
68
            self.tree._index_dirty = True
69
69
        conflicts = self.tree.conflicts()
70
70
        self.assertEqual(1, len(conflicts))
95
95
        self.assertEqual(
96
96
            delta,
97
97
            tree_delta_from_git_changes(changes, default_mapping,
98
 
                (GitFileIdMap({'a': b'a-id'}, default_mapping),
99
 
                 GitFileIdMap({'a': b'a-id'}, default_mapping))))
 
98
                (GitFileIdMap({u'a': b'a-id'}, default_mapping),
 
99
                 GitFileIdMap({u'a': b'a-id'}, default_mapping))))
100
100
 
101
101
 
102
102
class ChangesBetweenGitTreeAndWorkingCopyTests(TestCaseWithTransport):