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

  • Committer: Jelmer Vernooij
  • Date: 2018-04-02 00:52:27 UTC
  • mfrom: (6939 work)
  • mto: This revision was merged to the branch mainline in revision 7274.
  • Revision ID: jelmer@jelmer.uk-20180402005227-pecflp1mvdjrjqd6
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
62
62
        return response
63
63
 
64
64
 
65
 
LINES_AJ = 'a\nb\nc\nd\ne\nf\ng\nh\ni\nj\n'
66
 
 
67
 
 
68
 
LINES_ZY = 'z\nb\nc\nd\ne\nf\ng\nh\ni\ny\n'
69
 
 
70
 
 
71
 
LINES_AY = 'a\nb\nc\nd\ne\nf\ng\nh\ni\ny\n'
 
65
LINES_AJ = b'a\nb\nc\nd\ne\nf\ng\nh\ni\nj\n'
 
66
 
 
67
 
 
68
LINES_ZY = b'z\nb\nc\nd\ne\nf\ng\nh\ni\ny\n'
 
69
 
 
70
 
 
71
LINES_AY = b'a\nb\nc\nd\ne\nf\ng\nh\ni\ny\n'
72
72
 
73
73
 
74
74
class ShelfTestCase(tests.TestCaseWithTransport):
76
76
    def create_shelvable_tree(self):
77
77
        tree = self.make_branch_and_tree('tree')
78
78
        self.build_tree_contents([('tree/foo', LINES_AJ)])
79
 
        tree.add('foo', 'foo-id')
 
79
        tree.add('foo', b'foo-id')
80
80
        tree.commit('added foo')
81
81
        self.build_tree_contents([('tree/foo', LINES_ZY)])
82
82
        return tree
153
153
 
154
154
    def test_shelve_binary_change(self):
155
155
        tree = self.create_shelvable_tree()
156
 
        self.build_tree_contents([('tree/foo', '\x00')])
 
156
        self.build_tree_contents([('tree/foo', b'\x00')])
157
157
        tree.lock_tree_write()
158
158
        self.addCleanup(tree.unlock)
159
159
        shelver = ExpectShelver(tree, tree.basis_tree())
219
219
        self.requireFeature(features.SymlinkFeature)
220
220
        tree = self.create_shelvable_tree()
221
221
        os.symlink('bar', 'tree/baz')
222
 
        tree.add('baz', 'baz-id')
 
222
        tree.add('baz', b'baz-id')
223
223
        tree.commit("Add symlink")
224
224
        os.unlink('tree/baz')
225
225
        os.symlink('vax', 'tree/baz')
378
378
 
379
379
    def test_shelve_binary_change(self):
380
380
        tree = self.create_shelvable_tree()
381
 
        self.build_tree_contents([('tree/foo', '\x00')])
 
381
        self.build_tree_contents([('tree/foo', b'\x00')])
382
382
        tree.lock_tree_write()
383
383
        self.addCleanup(tree.unlock)
384
384
        shelver = ExpectShelver(tree, tree.basis_tree(),
448
448
        self.requireFeature(features.SymlinkFeature)
449
449
        tree = self.create_shelvable_tree()
450
450
        os.symlink('bar', 'tree/baz')
451
 
        tree.add('baz', 'baz-id')
 
451
        tree.add('baz', b'baz-id')
452
452
        tree.commit("Add symlink")
453
453
        os.unlink('tree/baz')
454
454
        os.symlink('vax', 'tree/baz')
471
471
        tree.lock_write()
472
472
        try:
473
473
            self.build_tree_contents([('tree/foo', LINES_AJ)])
474
 
            tree.add('foo', 'foo-id')
 
474
            tree.add('foo', b'foo-id')
475
475
            tree.commit('added foo')
476
476
            self.build_tree_contents([('tree/foo', LINES_ZY)])
477
477
            shelver = shelf_ui.Shelver(tree, tree.basis_tree(),