/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/per_workingtree/test_paths2ids.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-03 01:51:19 UTC
  • mfrom: (6973.14.14 python3-m)
  • Revision ID: breezy.the.bot@gmail.com-20180703015119-8wqoc0wqw45irl6r
Fix more tests on Python3.

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_paths2ids.py
160
160
            ['tree/dir/', 'tree/dir/child-moves', 'tree/dir/child-stays',
161
161
             'tree/dir/child-goes'])
162
162
        tree.add(['dir', 'dir/child-moves', 'dir/child-stays', 'dir/child-goes'],
163
 
                 ['dir', 'child-moves', 'child-stays', 'child-goes'])
 
163
                 [b'dir', b'child-moves', b'child-stays', b'child-goes'])
164
164
        tree.commit('create basis')
165
165
        basis = tree.basis_tree()
166
166
        tree.unversion(['dir/child-goes'])
173
173
        self.build_tree(['tree/newdir/dir/new-child'])
174
174
        tree.add(['newdir/dir/new-child'], ['new-child'])
175
175
        self.assertExpectedIds(
176
 
            ['newdir', 'dir', 'child-moves', 'child-stays', 'child-goes',
177
 
             'new-child'], tree, ['newdir'], [basis])
 
176
            [b'newdir', b'dir', b'child-moves', b'child-stays', b'child-goes',
 
177
             b'new-child'], tree, ['newdir'], [basis])
178
178
        self.assertExpectedIds(
179
 
            ['dir', 'child-moves', 'child-stays', 'child-goes', 'new-child'],
 
179
            [b'dir', b'child-moves', b'child-stays', b'child-goes', b'new-child'],
180
180
            tree, ['dir'], [basis])
181
181
 
182
182
    def test_unversioned_one_tree(self):
206
206
        tree.commit('make basis')
207
207
        basis = tree.basis_tree()
208
208
        self.build_tree(['tree/in-one'])
209
 
        tree.add(['in-one'], ['in-one'])
210
 
        self.assertExpectedIds(['in-one'], tree, ['in-one'], [basis])
 
209
        tree.add(['in-one'], [b'in-one'])
 
210
        self.assertExpectedIds([b'in-one'], tree, ['in-one'], [basis])
211
211
 
212
212
    def test_unversioned_all_of_multiple_trees(self):
213
213
        # in this test, the path is unversioned in every tree, and thus