← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_bundle.py
21
21
 
22
22
from bzrlib.bundle.serializer import read_bundle
23
23
from bzrlib.bzrdir import BzrDir
24
 
from bzrlib.tests import TestCaseInTempDir
25
 
 
26
 
 
27
 
class TestBundle(TestCaseInTempDir):
 
24
from bzrlib import tests
 
25
 
 
26
 
 
27
class TestBundle(tests.TestCaseWithTransport):
28
28
 
29
29
    def make_trees(self):
30
30
        grandparent_tree = BzrDir.create_standalone_workingtree('grandparent')
92
92
        stdout = self.run_bzr_subprocess('bundle')[0]
93
93
        br = read_bundle(StringIO(stdout))
94
94
        self.assertRevisions(br, ['revision3'])
 
95
 
 
96
    def test_no_common_ancestor(self):
 
97
        foo = self.make_branch_and_tree('foo')
 
98
        bar = self.make_branch_and_tree('bar')
 
99
        os.chdir('foo')
 
100
        self.run_bzr('bundle', '../bar')