bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
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 |
||
|
7479.2.1
by Jelmer Vernooij
Drop python2 support. |
19 |
from io import BytesIO |
20 |
||
|
7143.20.1
by Jelmer Vernooij
Move mergeable functions to breezy.mergeable. |
21 |
import breezy.mergeable |
|
7358.12.1
by Jelmer Vernooij
Move bundle code to breezy.bzr. |
22 |
from ..bzr.bundle.serializer import write_bundle |
|
6670.4.1
by Jelmer Vernooij
Update imports. |
23 |
import breezy.bzr.bzrdir |
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
24 |
from .. import errors |
25 |
from .. import tests |
|
26 |
from .test_transport import TestTransportImplementation |
|
27 |
from .per_transport import transport_test_permutations |
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
28 |
import breezy.transport |
29 |
import breezy.urlutils |
|
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
30 |
from .scenarios import load_tests_apply_scenarios |
|
5559.2.2
by Martin Pool
Change to using standard 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 |
||
|
6670.4.1
by Jelmer Vernooij
Update imports. |
39 |
format = breezy.bzr.bzrdir.BzrDirFormat.get_default_format() |
|
3251.4.11
by Aaron Bentley
Fix wrong local lookups |
40 |
|
41 |
bzrdir = format.initialize('tree') |
|
42 |
repo = bzrdir.create_repository() |
|
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
43 |
branch = repo.controldir.create_branch() |
44 |
wt = branch.controldir.create_workingtree() |
|
|
3251.4.11
by Aaron Bentley
Fix wrong local lookups |
45 |
|
46 |
wt.add(['a', 'subdir/']) |
|
|
6855.4.1
by Jelmer Vernooij
Yet more bees. |
47 |
wt.commit('new project', rev_id=b'commit-1') |
|
3251.4.11
by Aaron Bentley
Fix wrong local lookups |
48 |
|
|
6621.22.2
by Martin
Use BytesIO or StringIO from bzrlib.sixish |
49 |
out = BytesIO() |
|
7143.15.5
by Jelmer Vernooij
More PEP8 fixes. |
50 |
write_bundle(wt.branch.repository, wt.get_parent_ids()[0], b'null:', out) |
|
3251.4.11
by Aaron Bentley
Fix wrong local lookups |
51 |
out.seek(0) |
52 |
return out, wt |
|
53 |
||
54 |
||
|
5346.1.3
by Vincent Ladeuil
Delete bzrlib.bundle.read_bundle_from_url. |
55 |
class TestReadMergeableBundleFromURL(TestTransportImplementation): |
|
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
56 |
"""Test that read_bundle works properly across multiple transports""" |
57 |
||
|
5559.2.2
by Martin Pool
Change to using standard load_tests_apply_scenarios. |
58 |
scenarios = transport_test_permutations() |
59 |
||
|
4512.1.1
by Vincent Ladeuil
Fix bug #383920 by inserting the missing Content-Length header. |
60 |
def setUp(self): |
|
5346.1.3
by Vincent Ladeuil
Delete bzrlib.bundle.read_bundle_from_url. |
61 |
super(TestReadMergeableBundleFromURL, self).setUp() |
|
4512.1.1
by Vincent Ladeuil
Fix bug #383920 by inserting the missing Content-Length header. |
62 |
self.bundle_name = 'test_bundle' |
63 |
# read_mergeable_from_url will invoke get_transport which may *not*
|
|
64 |
# respect self._transport (i.e. returns a transport that is different
|
|
65 |
# from the one we want to test, so we must inject a correct transport
|
|
|
4512.1.2
by Vincent Ladeuil
lifeless said: try harder :) |
66 |
# into possible_transports first).
|
|
4512.1.1
by Vincent Ladeuil
Fix bug #383920 by inserting the missing Content-Length header. |
67 |
self.possible_transports = [self.get_transport(self.bundle_name)] |
|
6622.1.28
by Jelmer Vernooij
More renames; commands in output, environment variables. |
68 |
self.overrideEnv('BRZ_NO_SMART_VFS', None) |
|
7143.15.5
by Jelmer Vernooij
More PEP8 fixes. |
69 |
self.create_test_bundle() |
|
4512.1.1
by Vincent Ladeuil
Fix bug #383920 by inserting the missing Content-Length header. |
70 |
|
71 |
def read_mergeable_from_url(self, url): |
|
|
7143.20.1
by Jelmer Vernooij
Move mergeable functions to breezy.mergeable. |
72 |
return breezy.mergeable.read_mergeable_from_url( |
|
4512.1.1
by Vincent Ladeuil
Fix bug #383920 by inserting the missing Content-Length header. |
73 |
url, possible_transports=self.possible_transports) |
74 |
||
|
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
75 |
def get_url(self, relpath=''): |
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
76 |
return breezy.urlutils.join(self._server.get_url(), relpath) |
|
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
77 |
|
78 |
def create_test_bundle(self): |
|
|
3251.4.11
by Aaron Bentley
Fix wrong local lookups |
79 |
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 |
80 |
if self.get_transport().is_readonly(): |
|
4512.1.1
by Vincent Ladeuil
Fix bug #383920 by inserting the missing Content-Length header. |
81 |
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 |
82 |
else: |
|
4512.1.1
by Vincent Ladeuil
Fix bug #383920 by inserting the missing Content-Length header. |
83 |
self.get_transport().put_file(self.bundle_name, out) |
84 |
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 |
85 |
return wt |
86 |
||
|
3988.2.1
by Vincent Ladeuil
Workaround SSLFile wrong readline prototype and fix bogus tests. |
87 |
def test_read_mergeable_from_url(self): |
|
4512.1.1
by Vincent Ladeuil
Fix bug #383920 by inserting the missing Content-Length header. |
88 |
info = self.read_mergeable_from_url( |
|
7479.2.1
by Jelmer Vernooij
Drop python2 support. |
89 |
str(self.get_url(self.bundle_name))) |
|
2520.4.82
by Aaron Bentley
Fix tests to stop expecting bundles to build trees |
90 |
revision = info.real_revisions[-1] |
|
6973.14.12
by Jelmer Vernooij
Merge trunk. |
91 |
self.assertEqual(b'commit-1', revision.revision_id) |
|
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
92 |
|
93 |
def test_read_fail(self): |
|
94 |
# Trying to read from a directory, or non-bundle file
|
|
95 |
# should fail with NotABundle
|
|
|
4512.1.1
by Vincent Ladeuil
Fix bug #383920 by inserting the missing Content-Length header. |
96 |
self.assertRaises(errors.NotABundle, |
97 |
self.read_mergeable_from_url, self.get_url('tree')) |
|
98 |
self.assertRaises(errors.NotABundle, |
|
99 |
self.read_mergeable_from_url, self.get_url('tree/a')) |
|
|
3251.4.10
by Aaron Bentley
Pull of launchpad locations works (abentley, #181945) |
100 |
|
|
3988.2.1
by Vincent Ladeuil
Workaround SSLFile wrong readline prototype and fix bogus tests. |
101 |
def test_read_mergeable_respects_possible_transports(self): |
|
4512.1.1
by Vincent Ladeuil
Fix bug #383920 by inserting the missing Content-Length header. |
102 |
if not isinstance(self.get_transport(self.bundle_name), |
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
103 |
breezy.transport.ConnectedTransport): |
|
3988.2.1
by Vincent Ladeuil
Workaround SSLFile wrong readline prototype and fix bogus tests. |
104 |
# There is no point testing transport reuse for not connected
|
105 |
# transports (the test will fail even).
|
|
|
4512.1.1
by Vincent Ladeuil
Fix bug #383920 by inserting the missing Content-Length header. |
106 |
raise tests.TestSkipped( |
107 |
'Need a ConnectedTransport to test transport reuse') |
|
|
7479.2.1
by Jelmer Vernooij
Drop python2 support. |
108 |
url = str(self.get_url(self.bundle_name)) |
|
7143.15.5
by Jelmer Vernooij
More PEP8 fixes. |
109 |
self.read_mergeable_from_url(url) |
|
4512.1.1
by Vincent Ladeuil
Fix bug #383920 by inserting the missing Content-Length header. |
110 |
self.assertEqual(1, len(self.possible_transports)) |