/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-07-20 02:17:05 UTC
  • mfrom: (7518.1.2 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200720021705-5f11tmo1hdqjxm6x
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/387628

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
 
    )
38
35
 
39
36
 
40
37
EMPTY_SHELF = (b"Bazaar pack format 1 (introduced in 0.18)\n"
254
251
        try:
255
252
            creator.transform()
256
253
            self.check_shelve_creation(creator, tree)
257
 
        except MalformedTransform:
 
254
        except transform.MalformedTransform:
258
255
            raise KnownFailure(
259
256
                'shelving directory with ignored file: see bug #611739')
260
257
 
503
500
        parser = pack.ContainerPushParser()
504
501
        with open('shelf', 'rb') as shelf_file:
505
502
            parser.accept_bytes(shelf_file.read())
506
 
        tt = transform.TransformPreview(tree)
 
503
        tt = tree.preview_transform()
507
504
        self.addCleanup(tt.finalize)
508
505
        records = iter(parser.read_pending_records())
509
506
        # skip revision-id