← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_dpush.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_dpush.py
22
22
 
23
23
from bzrlib.branch import (
24
24
    Branch,
 
25
    InterBranch,
25
26
    )
26
27
from bzrlib.bzrdir import (
27
28
    BzrDirFormat,
38
39
    )
39
40
from bzrlib.tests.test_foreign import (
40
41
    DummyForeignVcsDirFormat,
 
42
    InterToDummyVcsBranch,
41
43
    )
42
44
 
43
45
 
45
47
 
46
48
    def setUp(self):
47
49
        BzrDirFormat.register_control_format(DummyForeignVcsDirFormat)
 
50
        InterBranch.register_optimiser(InterToDummyVcsBranch)
48
51
        self.addCleanup(self.unregister_format)
49
52
        super(TestDpush, self).setUp()
50
53
 
53
56
            BzrDirFormat.unregister_control_format(DummyForeignVcsDirFormat)
54
57
        except ValueError:
55
58
            pass
 
59
        InterBranch.unregister_optimiser(InterToDummyVcsBranch)
56
60
 
57
61
    def make_dummy_builder(self, relpath):
58
62
        builder = self.make_branch_builder(relpath,