← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_read_bundle.py

Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_read_bundle.py
35
35
def load_tests(standard_tests, module, loader):
36
36
    """Multiply tests for tranport implementations."""
37
37
    transport_tests, remaining_tests = tests.split_suite_by_condition(
38
 
        standard_tests, tests.condition_isinstance(TestReadBundleFromURL))
 
38
        standard_tests,
 
39
        tests.condition_isinstance(TestReadMergeableBundleFromURL))
39
40
    return tests.multiply_tests(transport_tests, transport_test_permutations(),
40
41
        remaining_tests)
41
42
 
60
61
    return out, wt
61
62
 
62
63
 
63
 
class TestDeprecations(tests.TestCaseInTempDir):
64
 
 
65
 
    def create_test_bundle(self):
66
 
        out, wt = create_bundle_file(self)
67
 
        f = open('test_bundle', 'wb')
68
 
        try:
69
 
            f.write(out.getvalue())
70
 
        finally:
71
 
            f.close()
72
 
        return wt
73
 
 
74
 
    def test_read_bundle_from_url_deprecated(self):
75
 
        wt = self.create_test_bundle()
76
 
        t = bzrlib.transport.get_transport(self.test_dir)
77
 
        url = t.abspath('test_bundle')
78
 
        self.callDeprecated([deprecated_in((1, 12, 0))
79
 
                             % 'bzrlib.bundle.read_bundle_from_url'],
80
 
                            bzrlib.bundle.read_bundle_from_url,
81
 
                            url)
82
 
 
83
 
 
84
 
class TestReadBundleFromURL(TestTransportImplementation):
 
64
class TestReadMergeableBundleFromURL(TestTransportImplementation):
85
65
    """Test that read_bundle works properly across multiple transports"""
86
66
 
87
67
    def setUp(self):
88
 
        super(TestReadBundleFromURL, self).setUp()
 
68
        super(TestReadMergeableBundleFromURL, self).setUp()
89
69
        self.bundle_name = 'test_bundle'
90
70
        # read_mergeable_from_url will invoke get_transport which may *not*
91
71
        # respect self._transport (i.e. returns a transport that is different