5557.1.8
by John Arbash Meinel
Switch the per-repository-reference code to use the default format for the repository. |
1 |
# Copyright (C) 2008-2011 Canonical Ltd
|
3221.10.1
by Robert Collins
Add add_inventory external reference interface tests and tweak broken test support function adapt_tests. |
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
|
3221.10.1
by Robert Collins
Add add_inventory external reference interface tests and tweak broken test support function adapt_tests. |
16 |
|
17 |
||
18 |
"""Repository implementation tests for external reference repositories.
|
|
19 |
||
3474.2.1
by Martin Pool
Merge and cleanup pre-external-reference-repository tests |
20 |
These tests check the conformance of repositories which refer to other
|
21 |
repositories for some data, and are run for each repository format supporting
|
|
22 |
this.
|
|
3221.10.1
by Robert Collins
Add add_inventory external reference interface tests and tweak broken test support function adapt_tests. |
23 |
"""
|
24 |
||
25 |
from bzrlib import ( |
|
5158.4.1
by Andrew Bennetts
Don't allow RemoteRepository to stack on incompatible formats. |
26 |
errors, |
3221.10.1
by Robert Collins
Add add_inventory external reference interface tests and tweak broken test support function adapt_tests. |
27 |
remote, |
6182.1.5
by Jelmer Vernooij
Fix more tests. |
28 |
urlutils, |
3221.10.1
by Robert Collins
Add add_inventory external reference interface tests and tweak broken test support function adapt_tests. |
29 |
)
|
6472.2.2
by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places. |
30 |
from bzrlib.controldir import ControlDir |
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
31 |
from bzrlib.tests import multiply_tests |
3689.1.1
by John Arbash Meinel
Rename repository_implementations tests into per_repository tests |
32 |
from bzrlib.tests.per_repository import ( |
3221.10.1
by Robert Collins
Add add_inventory external reference interface tests and tweak broken test support function adapt_tests. |
33 |
all_repository_format_scenarios, |
34 |
TestCaseWithRepository, |
|
35 |
)
|
|
36 |
||
37 |
||
38 |
class TestCaseWithExternalReferenceRepository(TestCaseWithRepository): |
|
39 |
||
6182.1.5
by Jelmer Vernooij
Fix more tests. |
40 |
def make_referring(self, relpath, a_repository): |
3221.10.1
by Robert Collins
Add add_inventory external reference interface tests and tweak broken test support function adapt_tests. |
41 |
"""Get a new repository that refers to a_repository.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
42 |
|
3221.10.1
by Robert Collins
Add add_inventory external reference interface tests and tweak broken test support function adapt_tests. |
43 |
:param relpath: The path to create the repository at.
|
44 |
:param a_repository: A repository to refer to.
|
|
45 |
"""
|
|
46 |
repo = self.make_repository(relpath) |
|
6182.1.5
by Jelmer Vernooij
Fix more tests. |
47 |
repo.add_fallback_repository(self.readonly_repository(a_repository)) |
3221.10.1
by Robert Collins
Add add_inventory external reference interface tests and tweak broken test support function adapt_tests. |
48 |
return repo |
49 |
||
6182.1.5
by Jelmer Vernooij
Fix more tests. |
50 |
def readonly_repository(self, repo): |
51 |
relpath = urlutils.basename(repo.bzrdir.user_url.rstrip('/')) |
|
6472.2.2
by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places. |
52 |
return ControlDir.open_from_transport( |
3221.10.1
by Robert Collins
Add add_inventory external reference interface tests and tweak broken test support function adapt_tests. |
53 |
self.get_readonly_transport(relpath)).open_repository() |
54 |
||
55 |
||
56 |
class TestCorrectFormat(TestCaseWithExternalReferenceRepository): |
|
57 |
||
58 |
def test_repository_format(self): |
|
59 |
# make sure the repository on tree.branch is of the desired format,
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
60 |
# because developers use this api to setup the tree, branch and
|
3221.10.1
by Robert Collins
Add add_inventory external reference interface tests and tweak broken test support function adapt_tests. |
61 |
# repository for their tests: having it not give the right repository
|
62 |
# type would invalidate the tests.
|
|
6182.1.5
by Jelmer Vernooij
Fix more tests. |
63 |
tree = self.make_branch_and_tree('repo') |
64 |
repo = self.make_referring('referring', tree.branch.repository) |
|
3221.10.1
by Robert Collins
Add add_inventory external reference interface tests and tweak broken test support function adapt_tests. |
65 |
self.assertIsInstance(repo._format, |
66 |
self.repository_format.__class__) |
|
67 |
||
68 |
||
5158.4.1
by Andrew Bennetts
Don't allow RemoteRepository to stack on incompatible formats. |
69 |
class TestIncompatibleStacking(TestCaseWithRepository): |
70 |
||
5609.55.2
by John Arbash Meinel
Tweak the tests a bit more. |
71 |
def make_repo_and_incompatible_fallback(self): |
5609.55.1
by John Arbash Meinel
Merge Gary's update, tweak the test a little bit. |
72 |
referring = self.make_repository('referring') |
73 |
if referring._format.supports_chks: |
|
5158.4.1
by Andrew Bennetts
Don't allow RemoteRepository to stack on incompatible formats. |
74 |
different_fmt = '1.9' |
75 |
else: |
|
76 |
different_fmt = '2a' |
|
5609.55.2
by John Arbash Meinel
Tweak the tests a bit more. |
77 |
fallback = self.make_repository('fallback', format=different_fmt) |
78 |
return referring, fallback |
|
79 |
||
80 |
def test_add_fallback_repository_rejects_incompatible(self): |
|
81 |
# Repository.add_fallback_repository raises IncompatibleRepositories
|
|
82 |
# if you take two repositories in different serializations and try to
|
|
83 |
# stack them.
|
|
84 |
referring, fallback = self.make_repo_and_incompatible_fallback() |
|
85 |
self.assertRaises(errors.IncompatibleRepositories, |
|
86 |
referring.add_fallback_repository, fallback) |
|
87 |
||
88 |
def test_add_fallback_doesnt_leave_fallback_locked(self): |
|
89 |
# Bug #835035. If the referring repository is locked, it wants to lock
|
|
90 |
# the fallback repository. But if they are incompatible, the referring
|
|
91 |
# repository won't take ownership of the fallback, and thus should not
|
|
92 |
# leave the repository in a locked state.
|
|
93 |
referring, fallback = self.make_repo_and_incompatible_fallback() |
|
94 |
self.addCleanup(referring.lock_read().unlock) |
|
5609.54.2
by Gary Poster
update previous commit to use existing test, which does not run the tests too many times |
95 |
# Assert precondition.
|
5609.55.2
by John Arbash Meinel
Tweak the tests a bit more. |
96 |
self.assertFalse(fallback.is_locked()) |
5609.54.2
by Gary Poster
update previous commit to use existing test, which does not run the tests too many times |
97 |
# Assert action.
|
5158.4.1
by Andrew Bennetts
Don't allow RemoteRepository to stack on incompatible formats. |
98 |
self.assertRaises(errors.IncompatibleRepositories, |
5609.55.2
by John Arbash Meinel
Tweak the tests a bit more. |
99 |
referring.add_fallback_repository, fallback) |
5609.54.2
by Gary Poster
update previous commit to use existing test, which does not run the tests too many times |
100 |
# Assert postcondition.
|
5609.55.2
by John Arbash Meinel
Tweak the tests a bit more. |
101 |
self.assertFalse(fallback.is_locked()) |
5158.4.1
by Andrew Bennetts
Don't allow RemoteRepository to stack on incompatible formats. |
102 |
|
103 |
||
3474.2.1
by Martin Pool
Merge and cleanup pre-external-reference-repository tests |
104 |
def external_reference_test_scenarios(): |
105 |
"""Generate test scenarios for repositories supporting external references.
|
|
106 |
"""
|
|
107 |
result = [] |
|
108 |
for test_name, scenario_info in all_repository_format_scenarios(): |
|
4118.1.1
by Andrew Bennetts
Fix performance regression (many small round-trips) when pushing to a remote pack, and tidy the tests. |
109 |
format = scenario_info['repository_format'] |
5557.1.8
by John Arbash Meinel
Switch the per-repository-reference code to use the default format for the repository. |
110 |
if (isinstance(format, remote.RemoteRepositoryFormat) |
111 |
or format.supports_external_lookups): |
|
3474.2.1
by Martin Pool
Merge and cleanup pre-external-reference-repository tests |
112 |
result.append((test_name, scenario_info)) |
113 |
return result |
|
114 |
||
115 |
||
116 |
def load_tests(standard_tests, module, loader): |
|
117 |
module_list = [ |
|
118 |
'bzrlib.tests.per_repository_reference.test_add_inventory', |
|
119 |
'bzrlib.tests.per_repository_reference.test_add_revision', |
|
120 |
'bzrlib.tests.per_repository_reference.test_add_signature_text', |
|
121 |
'bzrlib.tests.per_repository_reference.test_all_revision_ids', |
|
122 |
'bzrlib.tests.per_repository_reference.test_break_lock', |
|
123 |
'bzrlib.tests.per_repository_reference.test_check', |
|
5557.1.1
by John Arbash Meinel
Move the check for fallback repos cancelling commit to later in the cycle. |
124 |
'bzrlib.tests.per_repository_reference.test_commit_with_stacking', |
4103.2.3
by Andrew Bennetts
Other tests for good luck. |
125 |
'bzrlib.tests.per_repository_reference.test_default_stacking', |
4343.3.10
by John Arbash Meinel
Add a per_repository_reference test with real stacked repos. |
126 |
'bzrlib.tests.per_repository_reference.test_fetch', |
4537.3.1
by John Arbash Meinel
Start working on tests that get_record_stream gives reasonable results w/ stacking. |
127 |
'bzrlib.tests.per_repository_reference.test_get_record_stream', |
4419.2.9
by Andrew Bennetts
Add per_repository_reference test for get_rev_id_for_revno, fix the bugs it revealed. |
128 |
'bzrlib.tests.per_repository_reference.test_get_rev_id_for_revno', |
5050.70.1
by Martin Pool
Add failing test for bug 715000 |
129 |
'bzrlib.tests.per_repository_reference.test_graph', |
4379.2.2
by John Arbash Meinel
Change the Repository.add_fallback_repository() contract slightly. |
130 |
'bzrlib.tests.per_repository_reference.test_initialize', |
5816.8.3
by Andrew Bennetts
Add test for calling add_fallback_repository after _make_parents_provider, and make it work. |
131 |
'bzrlib.tests.per_repository_reference.test__make_parents_provider', |
4379.2.1
by John Arbash Meinel
Change the fallback repository code to only lock/unlock on transition. |
132 |
'bzrlib.tests.per_repository_reference.test_unlock', |
3221.10.1
by Robert Collins
Add add_inventory external reference interface tests and tweak broken test support function adapt_tests. |
133 |
]
|
3689.1.4
by John Arbash Meinel
Doc strings that reference repository_implementations |
134 |
# Parameterize per_repository_reference test modules by format.
|
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
135 |
standard_tests.addTests(loader.loadTestsFromModuleNames(module_list)) |
136 |
return multiply_tests(standard_tests, external_reference_test_scenarios(), |
|
137 |
loader.suiteClass()) |