/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-06-11 12:46:45 UTC
  • mfrom: (7511.1.1 actions-no-fork)
  • Revision ID: breezy.the.bot@gmail.com-20200611124645-4lx66gps99i0hmzh
Avoid using fork when running the testsuite in github actions.

Merged from https://code.launchpad.net/~jelmer/brz/actions-no-fork/+merge/385565

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
 
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