5557.1.7
by John Arbash Meinel
Merge in the bzr.dev 5582 |
1 |
# Copyright (C) 2006-2011 Canonical Ltd
|
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
2 |
#
|
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
#
|
|
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
#
|
|
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
16 |
|
17 |
"""Test read_bundle works properly across various transports."""
|
|
18 |
||
19 |
import cStringIO |
|
20 |
||
21 |
import bzrlib.bundle |
|
22 |
from bzrlib.bundle.serializer import write_bundle |
|
23 |
import bzrlib.bzrdir |
|
24 |
import bzrlib.errors as errors |
|
3251.4.11
by Aaron Bentley
Fix wrong local lookups |
25 |
from bzrlib import tests |
1871.1.2
by Robert Collins
Reduce code duplication in transport-parameterised tests. |
26 |
from bzrlib.tests.test_transport import TestTransportImplementation |
4523.1.4
by Martin Pool
Rename remaining *_implementations tests |
27 |
from bzrlib.tests.per_transport import transport_test_permutations |
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
28 |
import bzrlib.transport |
29 |
import bzrlib.urlutils |
|
5559.2.2
by Martin Pool
Change to using standard load_tests_apply_scenarios. |
30 |
from bzrlib.tests.scenarios import load_tests_apply_scenarios |
31 |
||
32 |
||
33 |
load_tests = load_tests_apply_scenarios |
|
3302.9.22
by Vincent Ladeuil
bzrlib.tests.test_read_bundle use load_tests. |
34 |
|
35 |
||
3251.4.11
by Aaron Bentley
Fix wrong local lookups |
36 |
def create_bundle_file(test_case): |
37 |
test_case.build_tree(['tree/', 'tree/a', 'tree/subdir/']) |
|
38 |
||
39 |
format = bzrlib.bzrdir.BzrDirFormat.get_default_format() |
|
40 |
||
41 |
bzrdir = format.initialize('tree') |
|
42 |
repo = bzrdir.create_repository() |
|
43 |
branch = repo.bzrdir.create_branch() |
|
44 |
wt = branch.bzrdir.create_workingtree() |
|
45 |
||
46 |
wt.add(['a', 'subdir/']) |
|
47 |
wt.commit('new project', rev_id='commit-1') |
|
48 |
||
49 |
out = cStringIO.StringIO() |
|
50 |
rev_ids = write_bundle(wt.branch.repository, |
|
51 |
wt.get_parent_ids()[0], 'null:', out) |
|
52 |
out.seek(0) |
|
53 |
return out, wt |
|
54 |
||
55 |
||
5346.1.3
by Vincent Ladeuil
Delete bzrlib.bundle.read_bundle_from_url. |
56 |
class TestReadMergeableBundleFromURL(TestTransportImplementation): |
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
57 |
"""Test that read_bundle works properly across multiple transports"""
|
58 |
||
5559.2.2
by Martin Pool
Change to using standard load_tests_apply_scenarios. |
59 |
scenarios = transport_test_permutations() |
60 |
||
4512.1.1
by Vincent Ladeuil
Fix bug #383920 by inserting the missing Content-Length header. |
61 |
def setUp(self): |
5346.1.3
by Vincent Ladeuil
Delete bzrlib.bundle.read_bundle_from_url. |
62 |
super(TestReadMergeableBundleFromURL, self).setUp() |
4512.1.1
by Vincent Ladeuil
Fix bug #383920 by inserting the missing Content-Length header. |
63 |
self.bundle_name = 'test_bundle' |
64 |
# read_mergeable_from_url will invoke get_transport which may *not*
|
|
65 |
# respect self._transport (i.e. returns a transport that is different
|
|
66 |
# from the one we want to test, so we must inject a correct transport
|
|
4512.1.2
by Vincent Ladeuil
lifeless said: try harder :) |
67 |
# into possible_transports first).
|
4512.1.1
by Vincent Ladeuil
Fix bug #383920 by inserting the missing Content-Length header. |
68 |
self.possible_transports = [self.get_transport(self.bundle_name)] |
5570.3.6
by Vincent Ladeuil
Get rid of all _captureVar() calls, no test failures, pfew. |
69 |
self.overrideEnv('BZR_NO_SMART_VFS', None) |
4512.1.1
by Vincent Ladeuil
Fix bug #383920 by inserting the missing Content-Length header. |
70 |
wt = self.create_test_bundle() |
71 |
||
72 |
def read_mergeable_from_url(self, url): |
|
73 |
return bzrlib.bundle.read_mergeable_from_url( |
|
74 |
url, possible_transports=self.possible_transports) |
|
75 |
||
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
76 |
def get_url(self, relpath=''): |
77 |
return bzrlib.urlutils.join(self._server.get_url(), relpath) |
|
78 |
||
79 |
def create_test_bundle(self): |
|
3251.4.11
by Aaron Bentley
Fix wrong local lookups |
80 |
out, wt = create_bundle_file(self) |
1752.2.26
by Martin Pool
test_read_bundle doesn't need to specially hold a connection open anymore |
81 |
if self.get_transport().is_readonly(): |
4512.1.1
by Vincent Ladeuil
Fix bug #383920 by inserting the missing Content-Length header. |
82 |
self.build_tree_contents([(self.bundle_name, out.getvalue())]) |
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
83 |
else: |
4512.1.1
by Vincent Ladeuil
Fix bug #383920 by inserting the missing Content-Length header. |
84 |
self.get_transport().put_file(self.bundle_name, out) |
85 |
self.log('Put to: %s', self.get_url(self.bundle_name)) |
|
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
86 |
return wt |
87 |
||
3988.2.1
by Vincent Ladeuil
Workaround SSLFile wrong readline prototype and fix bogus tests. |
88 |
def test_read_mergeable_from_url(self): |
4512.1.1
by Vincent Ladeuil
Fix bug #383920 by inserting the missing Content-Length header. |
89 |
info = self.read_mergeable_from_url( |
90 |
unicode(self.get_url(self.bundle_name))) |
|
2520.4.82
by Aaron Bentley
Fix tests to stop expecting bundles to build trees |
91 |
revision = info.real_revisions[-1] |
92 |
self.assertEqual('commit-1', revision.revision_id) |
|
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
93 |
|
94 |
def test_read_fail(self): |
|
95 |
# Trying to read from a directory, or non-bundle file
|
|
96 |
# should fail with NotABundle
|
|
4512.1.1
by Vincent Ladeuil
Fix bug #383920 by inserting the missing Content-Length header. |
97 |
self.assertRaises(errors.NotABundle, |
98 |
self.read_mergeable_from_url, self.get_url('tree')) |
|
99 |
self.assertRaises(errors.NotABundle, |
|
100 |
self.read_mergeable_from_url, self.get_url('tree/a')) |
|
3251.4.10
by Aaron Bentley
Pull of launchpad locations works (abentley, #181945) |
101 |
|
3988.2.1
by Vincent Ladeuil
Workaround SSLFile wrong readline prototype and fix bogus tests. |
102 |
def test_read_mergeable_respects_possible_transports(self): |
4512.1.1
by Vincent Ladeuil
Fix bug #383920 by inserting the missing Content-Length header. |
103 |
if not isinstance(self.get_transport(self.bundle_name), |
104 |
bzrlib.transport.ConnectedTransport): |
|
3988.2.1
by Vincent Ladeuil
Workaround SSLFile wrong readline prototype and fix bogus tests. |
105 |
# There is no point testing transport reuse for not connected
|
106 |
# transports (the test will fail even).
|
|
4512.1.1
by Vincent Ladeuil
Fix bug #383920 by inserting the missing Content-Length header. |
107 |
raise tests.TestSkipped( |
108 |
'Need a ConnectedTransport to test transport reuse') |
|
109 |
url = unicode(self.get_url(self.bundle_name)) |
|
110 |
info = self.read_mergeable_from_url(url) |
|
111 |
self.assertEqual(1, len(self.possible_transports)) |