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.per_transport import transport_test_permutations
30
28
import bzrlib.transport
31
29
from bzrlib.transport.memory import MemoryTransport
32
30
import bzrlib.urlutils
35
def load_tests(standard_tests, module, loader):
36
"""Multiply tests for tranport implementations."""
37
transport_tests, remaining_tests = tests.split_suite_by_condition(
38
standard_tests, tests.condition_isinstance(TestReadBundleFromURL))
39
return tests.multiply_tests(transport_tests, transport_test_permutations(),
43
def create_bundle_file(test_case):
44
test_case.build_tree(['tree/', 'tree/a', 'tree/subdir/'])
46
format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
48
bzrdir = format.initialize('tree')
49
repo = bzrdir.create_repository()
50
branch = repo.bzrdir.create_branch()
51
wt = branch.bzrdir.create_workingtree()
53
wt.add(['a', 'subdir/'])
54
wt.commit('new project', rev_id='commit-1')
56
out = cStringIO.StringIO()
57
rev_ids = write_bundle(wt.branch.repository,
58
wt.get_parent_ids()[0], 'null:', out)
63
class TestDeprecations(tests.TestCaseInTempDir):
65
def create_test_bundle(self):
66
out, wt = create_bundle_file(self)
67
f = open('test_bundle', 'wb')
69
f.write(out.getvalue())
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,
84
33
class TestReadBundleFromURL(TestTransportImplementation):
85
34
"""Test that read_bundle works properly across multiple transports"""
88
super(TestReadBundleFromURL, self).setUp()
89
self.bundle_name = 'test_bundle'
90
# read_mergeable_from_url will invoke get_transport which may *not*
91
# respect self._transport (i.e. returns a transport that is different
92
# from the one we want to test, so we must inject a correct transport
93
# into possible_transports first).
94
self.possible_transports = [self.get_transport(self.bundle_name)]
95
self._captureVar('BZR_NO_SMART_VFS', None)
96
wt = self.create_test_bundle()
98
def read_mergeable_from_url(self, url):
99
return bzrlib.bundle.read_mergeable_from_url(
100
url, possible_transports=self.possible_transports)
102
36
def get_url(self, relpath=''):
103
37
return bzrlib.urlutils.join(self._server.get_url(), relpath)
105
39
def create_test_bundle(self):
106
out, wt = create_bundle_file(self)
107
if self.get_transport().is_readonly():
108
self.build_tree_contents([(self.bundle_name, out.getvalue())])
40
# Can't use self.get_transport() because that asserts that
41
# it is not readonly, so just skip tests where the server is readonly
42
self._transport = self.get_transport()
43
#if isinstance(self._transport, MemoryTransport):
45
self.build_tree(['tree/', 'tree/a', 'tree/subdir/'])
47
format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
50
bzrdir = format.initialize('tree')
51
repo = bzrdir.create_repository()
52
branch = repo.bzrdir.create_branch()
53
wt = branch.bzrdir.create_workingtree()
55
wt.add(['a', 'subdir/'])
56
wt.commit('new project', rev_id='commit-1')
58
out = cStringIO.StringIO()
59
rev_ids = write_bundle(wt.branch.repository,
60
wt.last_revision(), None, out)
62
if self._transport.is_readonly():
63
f = open('test_bundle', 'wb')
64
f.write(out.getvalue())
110
self.get_transport().put_file(self.bundle_name, out)
111
self.log('Put to: %s', self.get_url(self.bundle_name))
67
self._transport.put('test_bundle', out)
68
self.log('Put to: %s', self.get_url('test_bundle'))
114
def test_read_mergeable_from_url(self):
115
info = self.read_mergeable_from_url(
116
unicode(self.get_url(self.bundle_name)))
117
revision = info.real_revisions[-1]
118
self.assertEqual('commit-1', revision.revision_id)
71
def test_read_bundle_from_url(self):
72
wt = self.create_test_bundle()
76
info = bzrlib.bundle.read_bundle_from_url(
77
self.get_url('test_bundle'))
78
bundle_tree = info.revision_tree(wt.branch.repository, info.target)
79
self.assertEqual('commit-1', bundle_tree.revision_id)
120
81
def test_read_fail(self):
121
82
# Trying to read from a directory, or non-bundle file
122
83
# should fail with NotABundle
123
self.assertRaises(errors.NotABundle,
124
self.read_mergeable_from_url, self.get_url('tree'))
125
self.assertRaises(errors.NotABundle,
126
self.read_mergeable_from_url, self.get_url('tree/a'))
84
wt = self.create_test_bundle()
128
def test_read_mergeable_respects_possible_transports(self):
129
if not isinstance(self.get_transport(self.bundle_name),
130
bzrlib.transport.ConnectedTransport):
131
# There is no point testing transport reuse for not connected
132
# transports (the test will fail even).
133
raise tests.TestSkipped(
134
'Need a ConnectedTransport to test transport reuse')
135
url = unicode(self.get_url(self.bundle_name))
136
info = self.read_mergeable_from_url(url)
137
self.assertEqual(1, len(self.possible_transports))
88
self.assertRaises(errors.NotABundle,
89
bzrlib.bundle.read_bundle_from_url,
91
self.assertRaises(errors.NotABundle,
92
bzrlib.bundle.read_bundle_from_url,
93
self.get_url('tree/a'))