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

  • Committer: Jelmer Vernooij
  • Date: 2019-03-05 07:32:38 UTC
  • mto: (7290.1.21 work)
  • mto: This revision was merged to the branch mainline in revision 7311.
  • Revision ID: jelmer@jelmer.uk-20190305073238-zlqn981opwnqsmzi
Add appveyor configuration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_shelf.py
32
32
    features,
33
33
    KnownFailure,
34
34
    )
 
35
from ..errors import (
 
36
    MalformedTransform,
 
37
    )
35
38
 
36
39
 
37
40
EMPTY_SHELF = (b"Bazaar pack format 1 (introduced in 0.18)\n"
251
254
        try:
252
255
            creator.transform()
253
256
            self.check_shelve_creation(creator, tree)
254
 
        except transform.MalformedTransform:
 
257
        except MalformedTransform:
255
258
            raise KnownFailure(
256
259
                'shelving directory with ignored file: see bug #611739')
257
260
 
378
381
        return creator, tree
379
382
 
380
383
    def check_shelve_deletion(self, tree):
381
 
        self.assertEqual(tree.id2path(b'foo-id'), 'foo')
382
 
        self.assertEqual(tree.id2path(b'bar-id'), 'foo/bar')
 
384
        self.assertTrue(tree.has_id(b'foo-id'))
 
385
        self.assertTrue(tree.has_id(b'bar-id'))
383
386
        self.assertFileEqual(b'baz', 'tree/foo/bar')
384
387
 
385
388
    def test_shelve_deletion(self):
500
503
        parser = pack.ContainerPushParser()
501
504
        with open('shelf', 'rb') as shelf_file:
502
505
            parser.accept_bytes(shelf_file.read())
503
 
        tt = tree.preview_transform()
 
506
        tt = transform.TransformPreview(tree)
504
507
        self.addCleanup(tt.finalize)
505
508
        records = iter(parser.read_pending_records())
506
509
        # skip revision-id
608
611
            creator.transform()
609
612
            creator.finalize()
610
613
        # validate the test setup
611
 
        self.assertEqual(tree.id2path(b'foo-id'), 'foo')
612
 
        self.assertEqual(tree.id2path(b'bar-id'), 'foo/bar')
 
614
        self.assertTrue(tree.has_id(b'foo-id'))
 
615
        self.assertTrue(tree.has_id(b'bar-id'))
613
616
        self.assertFileEqual(b'baz', 'tree/foo/bar')
614
617
        with open('shelf', 'r+b') as shelf_file:
615
618
            unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
616
619
            self.addCleanup(unshelver.finalize)
617
620
            unshelver.make_merger().do_merge()
618
 
        self.assertRaises(errors.NoSuchId, tree.id2path, b'foo-id')
619
 
        self.assertRaises(errors.NoSuchId, tree.id2path, b'bar-id')
 
621
        self.assertFalse(tree.has_id(b'foo-id'))
 
622
        self.assertFalse(tree.has_id(b'bar-id'))
620
623
 
621
624
    def test_unshelve_base(self):
622
625
        tree = self.make_branch_and_tree('tree')