/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2220.2.17 by Martin Pool
merge up from bzr.dev to get metadir changes
1
# Copyright (C) 2006, 2007 Canonical Ltd
1534.4.24 by Robert Collins
update (C) on branch_implementations/__init__.py
2
# Authors: Robert Collins <robert.collins@canonical.com>
2220.2.17 by Martin Pool
merge up from bzr.dev to get metadir changes
3
#          and others
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
4
#
1534.4.23 by Robert Collins
Move branch implementations tests into a package.
5
# This program is free software; you can redistribute it and/or modify
6
# it under the terms of the GNU General Public License as published by
7
# the Free Software Foundation; either version 2 of the License, or
8
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
9
#
1534.4.23 by Robert Collins
Move branch implementations tests into a package.
10
# This program is distributed in the hope that it will be useful,
11
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
14
#
1534.4.23 by Robert Collins
Move branch implementations tests into a package.
15
# You should have received a copy of the GNU General Public License
16
# along with this program; if not, write to the Free Software
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
19
20
"""Branch implementation tests for bzr.
21
22
These test the conformance of all the branch variations to the expected API.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
23
Specific tests for individual formats are in the tests/test_branch file
1534.4.23 by Robert Collins
Move branch implementations tests into a package.
24
rather than in tests/branch_implementations/*.py.
25
"""
26
2418.5.2 by John Arbash Meinel
Move TestCaseWithBranch into branch_implementations from test_branch.py
27
from bzrlib import (
28
    errors,
29
    tests,
30
    )
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
31
from bzrlib.branch import (BranchFormat,
32
                           _legacy_formats,
33
                           )
2418.5.11 by John Arbash Meinel
[merge] bzr.dev 2447
34
from bzrlib.remote import RemoteBranchFormat, RemoteBzrDirFormat
2018.5.167 by Andrew Bennetts
Various changes in response to John's review.
35
from bzrlib.smart.server import (
3453.5.1 by Andrew Bennetts
Add {bzrdir,repository,branch}_implementations tests for Remote objects using protocol v2 and pre-1.6 RPCs.
36
    ReadonlySmartTCPServer_for_testing,
37
    ReadonlySmartTCPServer_for_testing_v2_only,
2018.5.167 by Andrew Bennetts
Various changes in response to John's review.
38
    SmartTCPServer_for_testing,
3453.5.1 by Andrew Bennetts
Add {bzrdir,repository,branch}_implementations tests for Remote objects using protocol v2 and pre-1.6 RPCs.
39
    SmartTCPServer_for_testing_v2_only,
2018.5.167 by Andrew Bennetts
Various changes in response to John's review.
40
    )
2418.5.2 by John Arbash Meinel
Move TestCaseWithBranch into branch_implementations from test_branch.py
41
from bzrlib.tests.bzrdir_implementations.test_bzrdir import TestCaseWithBzrDir
2018.5.167 by Andrew Bennetts
Various changes in response to John's review.
42
from bzrlib.transport.memory import MemoryServer
2418.5.2 by John Arbash Meinel
Move TestCaseWithBranch into branch_implementations from test_branch.py
43
44
4084.5.1 by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters.
45
def make_scenarios(transport_server, transport_readonly_server,
46
    formats, vfs_transport_factory=None, name_suffix=''):
47
    """Transform the input formats to a list of scenarios.
2553.2.6 by Robert Collins
And overhaul BranchTestProviderAdapter too.
48
4084.5.1 by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters.
49
    :param formats: A list of (branch_format, bzrdir_format).
2553.2.6 by Robert Collins
And overhaul BranchTestProviderAdapter too.
50
    """
4084.5.1 by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters.
51
    result = []
52
    for branch_format, bzrdir_format in formats:
53
        # some branches don't have separate format objects.
54
        # so we have a conditional here to handle them.
55
        scenario_name = getattr(branch_format, '__name__',
56
            branch_format.__class__.__name__)
57
        scenario_name += name_suffix
58
        scenario = (scenario_name, {
59
            "transport_server":transport_server,
60
            "transport_readonly_server":transport_readonly_server,
61
            "bzrdir_format":bzrdir_format,
62
            "branch_format":branch_format,
63
                })
64
        result.append(scenario)
65
    return result
2553.2.6 by Robert Collins
And overhaul BranchTestProviderAdapter too.
66
67
2418.5.2 by John Arbash Meinel
Move TestCaseWithBranch into branch_implementations from test_branch.py
68
class TestCaseWithBranch(TestCaseWithBzrDir):
4084.5.1 by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters.
69
    """This helper will be parameterised in each branch_implementation test."""
2418.5.2 by John Arbash Meinel
Move TestCaseWithBranch into branch_implementations from test_branch.py
70
71
    def setUp(self):
72
        super(TestCaseWithBranch, self).setUp()
73
        self.branch = None
74
75
    def get_branch(self):
76
        if self.branch is None:
77
            self.branch = self.make_branch('')
78
        return self.branch
79
80
    def make_branch(self, relpath, format=None):
81
        repo = self.make_repository(relpath, format=format)
82
        # fixme RBC 20060210 this isnt necessarily a fixable thing,
83
        # Skipped is the wrong exception to raise.
84
        try:
85
            return self.branch_format.initialize(repo.bzrdir)
86
        except errors.UninitializableFormat:
87
            raise tests.TestSkipped('Uninitializable branch format')
88
3904.3.4 by Andrew Bennetts
First cut of a branch_implementations test. It fails.
89
    def make_branch_builder(self, relpath, format=None):
90
        if format is None:
91
            format = self.branch_format._matchingbzrdir
92
        return super(TestCaseWithBranch, self).make_branch_builder(
93
            relpath, format=format)
94
2418.5.2 by John Arbash Meinel
Move TestCaseWithBranch into branch_implementations from test_branch.py
95
    def make_repository(self, relpath, shared=False, format=None):
96
        made_control = self.make_bzrdir(relpath, format=format)
97
        return made_control.create_repository(shared=shared)
98
99
    def create_tree_with_merge(self):
100
        """Create a branch with a simple ancestry.
101
102
        The graph should look like:
103
            digraph H {
104
                "rev-1" -> "rev-2" -> "rev-3";
105
                "rev-1" -> "rev-1.1.1" -> "rev-3";
106
            }
107
108
        Or in ASCII:
2418.5.14 by John Arbash Meinel
clean up ASCII revision graph art.
109
            1
110
            |\
111
            2 1.1.1
112
            |/
113
            3
2418.5.2 by John Arbash Meinel
Move TestCaseWithBranch into branch_implementations from test_branch.py
114
        """
115
        tree = self.make_branch_and_memory_tree('tree')
116
        tree.lock_write()
117
        try:
118
            tree.add('')
119
            tree.commit('first', rev_id='rev-1')
2418.5.3 by John Arbash Meinel
Use a more straightforward implementation of generating 'tree_with_merge'
120
            tree.commit('second', rev_id='rev-1.1.1')
2418.5.10 by John Arbash Meinel
fix typo
121
            # Uncommit that last commit and switch to the other line
2418.5.2 by John Arbash Meinel
Move TestCaseWithBranch into branch_implementations from test_branch.py
122
            tree.branch.set_last_revision_info(1, 'rev-1')
123
            tree.set_parent_ids(['rev-1'])
2418.5.3 by John Arbash Meinel
Use a more straightforward implementation of generating 'tree_with_merge'
124
            tree.commit('alt-second', rev_id='rev-2')
2418.5.2 by John Arbash Meinel
Move TestCaseWithBranch into branch_implementations from test_branch.py
125
            tree.set_parent_ids(['rev-2', 'rev-1.1.1'])
126
            tree.commit('third', rev_id='rev-3')
127
        finally:
128
            tree.unlock()
129
130
        return tree
1534.4.23 by Robert Collins
Move branch implementations tests into a package.
131
1534.4.24 by Robert Collins
update (C) on branch_implementations/__init__.py
132
4084.5.1 by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters.
133
def load_tests(standard_tests, module, loader):
1534.4.23 by Robert Collins
Move branch implementations tests into a package.
134
    test_branch_implementations = [
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
135
        'bzrlib.tests.branch_implementations.test_bound_sftp',
1534.4.23 by Robert Collins
Move branch implementations tests into a package.
136
        'bzrlib.tests.branch_implementations.test_branch',
1687.1.8 by Robert Collins
Teach Branch about break_lock.
137
        'bzrlib.tests.branch_implementations.test_break_lock',
3389.2.1 by John Arbash Meinel
Add code to 'bzr check' to detect when the mainline history is inconsistent.
138
        'bzrlib.tests.branch_implementations.test_check',
2370.3.1 by John Arbash Meinel
(John Arbash Meinel) Fix bug #93854, make 'bzr checkout' create branches in the same format as the source.
139
        'bzrlib.tests.branch_implementations.test_create_checkout',
4044.1.1 by Robert Collins
Create Branch.create_clone_on_transport helper method to combine bzr and branch creation for push.
140
        'bzrlib.tests.branch_implementations.test_create_clone',
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
141
        'bzrlib.tests.branch_implementations.test_commit',
3949.2.2 by Ian Clatworthy
add interface test and NEWS item
142
        'bzrlib.tests.branch_implementations.test_dotted_revno_to_revision_id',
2418.5.7 by John Arbash Meinel
Move the revision_id=>map generation to be a public function.
143
        'bzrlib.tests.branch_implementations.test_get_revision_id_to_revno_map',
2245.1.1 by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers
144
        'bzrlib.tests.branch_implementations.test_hooks',
1864.7.3 by John Arbash Meinel
Test that the right thing happens when clone/sprout is done with an invalid parent
145
        'bzrlib.tests.branch_implementations.test_http',
3949.3.2 by Ian Clatworthy
feedback from jam
146
        'bzrlib.tests.branch_implementations.test_iter_merge_sorted_revisions',
2249.4.1 by Wouter van Heyst
New Branch.last_revision_info method, this is being done to allow
147
        'bzrlib.tests.branch_implementations.test_last_revision_info',
1711.8.5 by John Arbash Meinel
Move the new locking tests into their own files, and move the helper functions into a test helper.
148
        'bzrlib.tests.branch_implementations.test_locking',
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
149
        'bzrlib.tests.branch_implementations.test_parent',
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
150
        'bzrlib.tests.branch_implementations.test_permissions',
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
151
        'bzrlib.tests.branch_implementations.test_pull',
2375.1.5 by Andrew Bennetts
Deal with review comments from Robert:
152
        'bzrlib.tests.branch_implementations.test_push',
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
153
        'bzrlib.tests.branch_implementations.test_reconcile',
2375.1.5 by Andrew Bennetts
Deal with review comments from Robert:
154
        'bzrlib.tests.branch_implementations.test_revision_history',
3949.2.3 by Ian Clatworthy
add Branch.revision_id_to_dotted_revno()
155
        'bzrlib.tests.branch_implementations.test_revision_id_to_dotted_revno',
2418.5.1 by John Arbash Meinel
Make a Branch helper which can create a very basic MemoryTree with history.
156
        'bzrlib.tests.branch_implementations.test_revision_id_to_revno',
2524.1.1 by Aaron Bentley
Revert broken changes
157
        'bzrlib.tests.branch_implementations.test_sprout',
3221.11.2 by Robert Collins
Create basic stackable branch facility.
158
        'bzrlib.tests.branch_implementations.test_stacking',
2220.2.13 by mbp at sourcefrog
reconnect and fix up lower-level tests for tags
159
        'bzrlib.tests.branch_implementations.test_tags',
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
160
        'bzrlib.tests.branch_implementations.test_uncommit',
1587.1.10 by Robert Collins
update updates working tree and branch together.
161
        'bzrlib.tests.branch_implementations.test_update',
1534.4.23 by Robert Collins
Move branch implementations tests into a package.
162
        ]
4084.5.1 by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters.
163
    sub_tests = loader.loadTestsFromModuleNames(test_branch_implementations)
2018.11.2 by Andrew Bennetts
Hookup RemoteBranch for testing by bzrlib/tests/branch_implementations tests.
164
    # Generate a list of branch formats and their associated bzrdir formats to
165
    # use.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
166
    combinations = [(format, format._matchingbzrdir) for format in
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
167
         BranchFormat._formats.values() + _legacy_formats]
4084.5.1 by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters.
168
    scenarios = make_scenarios(
2018.5.114 by Robert Collins
Commit current test pass improvements.
169
        # None here will cause the default vfs transport server to be used.
170
        None,
1534.4.23 by Robert Collins
Move branch implementations tests into a package.
171
        # None here will cause a readonly decorator to be created
172
        # by the TestCaseWithTransport.get_readonly_transport method.
173
        None,
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
174
        combinations)
3453.5.1 by Andrew Bennetts
Add {bzrdir,repository,branch}_implementations tests for Remote objects using protocol v2 and pre-1.6 RPCs.
175
    # Add RemoteBranch tests, which need a special server.
3834.5.2 by John Arbash Meinel
Track down the various BranchFormats that weren't setting the branch format as part of the _matchingbzrdir format.
176
    remote_branch_format = RemoteBranchFormat()
4084.5.1 by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters.
177
    scenarios.extend(make_scenarios(
2018.11.2 by Andrew Bennetts
Hookup RemoteBranch for testing by bzrlib/tests/branch_implementations tests.
178
        SmartTCPServer_for_testing,
179
        ReadonlySmartTCPServer_for_testing,
3834.5.2 by John Arbash Meinel
Track down the various BranchFormats that weren't setting the branch format as part of the _matchingbzrdir format.
180
        [(remote_branch_format, remote_branch_format._matchingbzrdir)],
3453.5.1 by Andrew Bennetts
Add {bzrdir,repository,branch}_implementations tests for Remote objects using protocol v2 and pre-1.6 RPCs.
181
        MemoryServer,
4084.5.1 by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters.
182
        name_suffix='-default'))
3453.5.1 by Andrew Bennetts
Add {bzrdir,repository,branch}_implementations tests for Remote objects using protocol v2 and pre-1.6 RPCs.
183
    # Also add tests for RemoteBranch with HPSS protocol v2 (i.e. bzr <1.6)
184
    # server.
4084.5.1 by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters.
185
    scenarios.extend(make_scenarios(
3453.5.1 by Andrew Bennetts
Add {bzrdir,repository,branch}_implementations tests for Remote objects using protocol v2 and pre-1.6 RPCs.
186
        SmartTCPServer_for_testing_v2_only,
187
        ReadonlySmartTCPServer_for_testing_v2_only,
3834.5.2 by John Arbash Meinel
Track down the various BranchFormats that weren't setting the branch format as part of the _matchingbzrdir format.
188
        [(remote_branch_format, remote_branch_format._matchingbzrdir)],
3453.5.1 by Andrew Bennetts
Add {bzrdir,repository,branch}_implementations tests for Remote objects using protocol v2 and pre-1.6 RPCs.
189
        MemoryServer,
4084.5.1 by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters.
190
        name_suffix='-v2'))
191
    # add the tests for the sub modules
192
    return tests.multiply_tests(sub_tests, scenarios, standard_tests)