~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-04-18 04:55:00 UTC
  • mfrom: (5784.2.1 754188-apport-test)
  • Revision ID: pqm@pqm.ubuntu.com-20110418045500-ce6lkgyiq7f47q43
(mbp) Rewrite test_report_bug_legacy away from using doctest (see bug
 764188) (Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
27
27
    inventory,
28
28
    merge,
29
29
    osutils,
30
 
    repository,
31
30
    revision as _mod_revision,
32
31
    tests,
33
32
    treebuilder,
35
34
from bzrlib.bundle import read_mergeable_from_url
36
35
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
37
36
from bzrlib.bundle.bundle_data import BundleTree
38
 
from bzrlib.bzrdir import BzrDir
39
37
from bzrlib.directory_service import directories
40
38
from bzrlib.bundle.serializer import write_bundle, read_bundle, v09, v4
41
39
from bzrlib.bundle.serializer.v08 import BundleSerializerV08
42
40
from bzrlib.bundle.serializer.v09 import BundleSerializerV09
43
41
from bzrlib.bundle.serializer.v4 import BundleSerializerV4
44
 
from bzrlib.branch import Branch
45
42
from bzrlib.repofmt import knitrepo
46
43
from bzrlib.tests import (
47
44
    test_read_bundle,
1412
1409
        branch = tree_a.branch
1413
1410
        repo_a = branch.repository
1414
1411
        tree_a.commit("base", allow_pointless=True, rev_id='A')
1415
 
        self.failIf(branch.repository.has_signature_for_revision_id('A'))
 
1412
        self.assertFalse(branch.repository.has_signature_for_revision_id('A'))
1416
1413
        try:
1417
1414
            from bzrlib.testament import Testament
1418
1415
            # monkey patch gpg signing mechanism
1442
1439
        install_bundle(repo_b, serializer.read(s))
1443
1440
 
1444
1441
 
1445
 
class V4WeaveBundleTester(V4BundleTester):
1446
 
 
1447
 
    def bzrdir_format(self):
1448
 
        return 'metaweave'
1449
 
 
1450
 
 
1451
1442
class V4_2aBundleTester(V4BundleTester):
1452
1443
 
1453
1444
    def bzrdir_format(self):