← 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

  • Committer: Aaron Bentley
  • Date: 2007-12-09 23:53:50 UTC
  • mto: This revision was merged to the branch mainline in revision 3133.
  • Revision ID: aaron.bentley@utoronto.ca-20071209235350-qp39yk0xzx7a4f6p
Don't use the base if not cherrypicking

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_read_bundle.py
23
23
from bzrlib.bundle.serializer import write_bundle
24
24
import bzrlib.bzrdir
25
25
import bzrlib.errors as errors
26
 
from bzrlib.symbol_versioning import deprecated_in
27
 
from bzrlib import tests
 
26
from bzrlib.tests import TestCaseInTempDir
28
27
from bzrlib.tests.test_transport import TestTransportImplementation
29
 
from bzrlib.tests.test_transport_implementations import TransportTestProviderAdapter
30
28
import bzrlib.transport
31
29
from bzrlib.transport.memory import MemoryTransport
32
30
import bzrlib.urlutils
33
31
 
34
32
 
35
 
def load_tests(standard_tests, module, loader):
36
 
    """Multiply tests for tranport implementations."""
37
 
    result = loader.suiteClass()
38
 
    transport_tests, remaining_tests = tests.split_suite_by_condition(
39
 
        standard_tests, tests.condition_isinstance((TestReadBundleFromURL)))
40
 
 
41
 
    adapter = TransportTestProviderAdapter()
42
 
    tests.adapt_tests(transport_tests, adapter, result)
43
 
 
44
 
    # No parametrization for the remaining tests
45
 
    result.addTests(remaining_tests)
46
 
 
47
 
    return result
48
 
 
49
 
 
50
 
def create_bundle_file(test_case):
51
 
    test_case.build_tree(['tree/', 'tree/a', 'tree/subdir/'])
52
 
 
53
 
    format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
54
 
 
55
 
    bzrdir = format.initialize('tree')
56
 
    repo = bzrdir.create_repository()
57
 
    branch = repo.bzrdir.create_branch()
58
 
    wt = branch.bzrdir.create_workingtree()
59
 
 
60
 
    wt.add(['a', 'subdir/'])
61
 
    wt.commit('new project', rev_id='commit-1')
62
 
 
63
 
    out = cStringIO.StringIO()
64
 
    rev_ids = write_bundle(wt.branch.repository,
65
 
                           wt.get_parent_ids()[0], 'null:', out)
66
 
    out.seek(0)
67
 
    return out, wt
68
 
 
69
 
 
70
 
class TestDeprecations(tests.TestCaseInTempDir):
71
 
 
72
 
    def create_test_bundle(self):
73
 
        out, wt = create_bundle_file(self)
74
 
        f = open('test_bundle', 'wb')
75
 
        f.write(out.getvalue())
76
 
        f.close()
77
 
        return wt
78
 
 
79
 
    def test_read_bundle_from_url_deprecated(self):
80
 
        wt = self.create_test_bundle()
81
 
        t = bzrlib.transport.get_transport(self.test_dir)
82
 
        url = t.abspath('test_bundle')
83
 
        self.callDeprecated([deprecated_in((1, 12, 0))
84
 
                             % 'bzrlib.bundle.read_bundle_from_url'],
85
 
                            bzrlib.bundle.read_bundle_from_url,
86
 
                            url)
87
 
 
88
 
 
89
33
class TestReadBundleFromURL(TestTransportImplementation):
90
34
    """Test that read_bundle works properly across multiple transports"""
91
35
 
93
37
        return bzrlib.urlutils.join(self._server.get_url(), relpath)
94
38
 
95
39
    def create_test_bundle(self):
96
 
        out, wt = create_bundle_file(self)
 
40
        self.build_tree(['tree/', 'tree/a', 'tree/subdir/'])
 
41
 
 
42
        format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
 
43
 
 
44
        bzrdir = format.initialize('tree')
 
45
        repo = bzrdir.create_repository()
 
46
        branch = repo.bzrdir.create_branch()
 
47
        wt = branch.bzrdir.create_workingtree()
 
48
 
 
49
        wt.add(['a', 'subdir/'])
 
50
        wt.commit('new project', rev_id='commit-1')
 
51
 
 
52
        out = cStringIO.StringIO()
 
53
        rev_ids = write_bundle(wt.branch.repository,
 
54
                               wt.get_parent_ids()[0], 'null:', out)
 
55
        out.seek(0)
97
56
        if self.get_transport().is_readonly():
98
57
            f = open('test_bundle', 'wb')
99
58
            f.write(out.getvalue())
103
62
            self.log('Put to: %s', self.get_url('test_bundle'))
104
63
        return wt
105
64
 
106
 
    def test_read_mergeable_from_url(self):
 
65
    def test_read_bundle_from_url(self):
107
66
        self._captureVar('BZR_NO_SMART_VFS', None)
108
67
        wt = self.create_test_bundle()
109
68
        if wt is None:
110
69
            return
111
 
        # read_mergeable_from_url will invoke get_transport which may *not*
112
 
        # respect self._transport (i.e. returns a transport that is different
113
 
        # from the one we want to test, so we must inject a correct transport
114
 
        # into possible_transports first.
115
 
        t = self.get_transport('test_bundle')
116
 
        possible_transports = [t]
117
 
        info = bzrlib.bundle.read_mergeable_from_url(
118
 
                    unicode(self.get_url('test_bundle')),
119
 
                    possible_transports=possible_transports)
 
70
        info = bzrlib.bundle.read_bundle_from_url(
 
71
                    unicode(self.get_url('test_bundle')))
120
72
        revision = info.real_revisions[-1]
121
73
        self.assertEqual('commit-1', revision.revision_id)
122
74
 
128
80
        if wt is None:
129
81
            return
130
82
 
131
 
        self.assertRaises(errors.NotABundle,
132
 
            bzrlib.bundle.read_mergeable_from_url,
 
83
        self.assertRaises(errors.NotABundle, 
 
84
            bzrlib.bundle.read_bundle_from_url, 
133
85
            self.get_url('tree'))
134
 
        self.assertRaises(errors.NotABundle,
135
 
            bzrlib.bundle.read_mergeable_from_url,
 
86
        self.assertRaises(errors.NotABundle, 
 
87
            bzrlib.bundle.read_bundle_from_url, 
136
88
            self.get_url('tree/a'))
137
 
 
138
 
    def test_read_mergeable_respects_possible_transports(self):
139
 
        t = self.get_transport('test_bundle')
140
 
        if not isinstance(t, bzrlib.transport.ConnectedTransport):
141
 
            # There is no point testing transport reuse for not connected
142
 
            # transports (the test will fail even).
143
 
            return
144
 
        self._captureVar('BZR_NO_SMART_VFS', None)
145
 
        wt = self.create_test_bundle()
146
 
        if wt is None:
147
 
            return
148
 
        # read_mergeable_from_url will invoke get_transport which may *not*
149
 
        # respect self._transport (i.e. returns a transport that is different
150
 
        # from the one we want to test, so we must inject a correct transport
151
 
        # into possible_transports first.
152
 
        possible_transports = [t]
153
 
        url = unicode(self.get_url('test_bundle'))
154
 
        info = bzrlib.bundle.read_mergeable_from_url(url,
155
 
            possible_transports=possible_transports)
156
 
        self.assertEqual(1, len(possible_transports))