~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/branch_implementations/__init__.py

  • Committer: Robert Collins
  • Date: 2007-07-04 08:08:13 UTC
  • mfrom: (2572 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2587.
  • Revision ID: robertc@robertcollins.net-20070704080813-wzebx0r88fvwj5rq
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006 by Canonical Ltd
 
1
# Copyright (C) 2006, 2007 Canonical Ltd
2
2
# Authors: Robert Collins <robert.collins@canonical.com>
3
 
# -*- coding: utf-8 -*-
 
3
#          and others
4
4
#
5
5
# This program is free software; you can redistribute it and/or modify
6
6
# it under the terms of the GNU General Public License as published by
24
24
rather than in tests/branch_implementations/*.py.
25
25
"""
26
26
 
 
27
from bzrlib import (
 
28
    errors,
 
29
    tests,
 
30
    )
27
31
from bzrlib.branch import (BranchFormat,
28
 
                           BranchTestProviderAdapter,
29
32
                           _legacy_formats,
30
33
                           )
31
 
from bzrlib.tests import (
32
 
                          adapt_modules,
33
 
                          default_transport,
34
 
                          TestLoader,
35
 
                          TestSuite,
36
 
                          )
 
34
from bzrlib.remote import RemoteBranchFormat, RemoteBzrDirFormat
 
35
from bzrlib.smart.server import (
 
36
    SmartTCPServer_for_testing,
 
37
    ReadonlySmartTCPServer_for_testing,
 
38
    )
 
39
from bzrlib.tests.bzrdir_implementations.test_bzrdir import TestCaseWithBzrDir
 
40
from bzrlib.transport.memory import MemoryServer
 
41
 
 
42
 
 
43
class BranchTestProviderAdapter(tests.TestScenarioApplier):
 
44
    """A tool to generate a suite testing multiple branch formats at once.
 
45
 
 
46
    This is done by copying the test once for each transport and injecting
 
47
    the transport_server, transport_readonly_server, and branch_format
 
48
    classes into each copy. Each copy is also given a new id() to make it
 
49
    easy to identify.
 
50
    """
 
51
 
 
52
    def __init__(self, transport_server, transport_readonly_server, formats,
 
53
        vfs_transport_factory=None):
 
54
        self._transport_server = transport_server
 
55
        self._transport_readonly_server = transport_readonly_server
 
56
        self.scenarios = self.formats_to_scenarios(formats)
 
57
    
 
58
    def formats_to_scenarios(self, formats):
 
59
        """Transform the input formats to a list of scenarios.
 
60
 
 
61
        :param formats: A list of (branch_format, bzrdir_format).
 
62
        """
 
63
        result = []
 
64
        for branch_format, bzrdir_format in formats:
 
65
            # some branches don't have separate format objects.
 
66
            # so we have a conditional here to handle them.
 
67
            scenario_name = getattr(branch_format, '__name__',
 
68
                branch_format.__class__.__name__)
 
69
            scenario = (scenario_name, {
 
70
                "transport_server":self._transport_server,
 
71
                "transport_readonly_server":self._transport_readonly_server,
 
72
                "bzrdir_format":bzrdir_format,
 
73
                "branch_format":branch_format,
 
74
                    })
 
75
            result.append(scenario)
 
76
        return result
 
77
 
 
78
 
 
79
class TestCaseWithBranch(TestCaseWithBzrDir):
 
80
    """This helper will be adapted for each branch_implementation test."""
 
81
 
 
82
    def setUp(self):
 
83
        super(TestCaseWithBranch, self).setUp()
 
84
        self.branch = None
 
85
 
 
86
    def get_branch(self):
 
87
        if self.branch is None:
 
88
            self.branch = self.make_branch('')
 
89
        return self.branch
 
90
 
 
91
    def make_branch(self, relpath, format=None):
 
92
        repo = self.make_repository(relpath, format=format)
 
93
        # fixme RBC 20060210 this isnt necessarily a fixable thing,
 
94
        # Skipped is the wrong exception to raise.
 
95
        try:
 
96
            return self.branch_format.initialize(repo.bzrdir)
 
97
        except errors.UninitializableFormat:
 
98
            raise tests.TestSkipped('Uninitializable branch format')
 
99
 
 
100
    def make_repository(self, relpath, shared=False, format=None):
 
101
        made_control = self.make_bzrdir(relpath, format=format)
 
102
        return made_control.create_repository(shared=shared)
 
103
 
 
104
    def create_tree_with_merge(self):
 
105
        """Create a branch with a simple ancestry.
 
106
 
 
107
        The graph should look like:
 
108
            digraph H {
 
109
                "rev-1" -> "rev-2" -> "rev-3";
 
110
                "rev-1" -> "rev-1.1.1" -> "rev-3";
 
111
            }
 
112
 
 
113
        Or in ASCII:
 
114
            1
 
115
            |\
 
116
            2 1.1.1
 
117
            |/
 
118
            3
 
119
        """
 
120
        tree = self.make_branch_and_memory_tree('tree')
 
121
        tree.lock_write()
 
122
        try:
 
123
            tree.add('')
 
124
            tree.commit('first', rev_id='rev-1')
 
125
            tree.commit('second', rev_id='rev-1.1.1')
 
126
            # Uncommit that last commit and switch to the other line
 
127
            tree.branch.set_last_revision_info(1, 'rev-1')
 
128
            tree.set_parent_ids(['rev-1'])
 
129
            tree.commit('alt-second', rev_id='rev-2')
 
130
            tree.set_parent_ids(['rev-2', 'rev-1.1.1'])
 
131
            tree.commit('third', rev_id='rev-3')
 
132
        finally:
 
133
            tree.unlock()
 
134
 
 
135
        return tree
37
136
 
38
137
 
39
138
def test_suite():
40
 
    result = TestSuite()
 
139
    result = tests.TestSuite()
41
140
    test_branch_implementations = [
42
141
        'bzrlib.tests.branch_implementations.test_bound_sftp',
43
142
        'bzrlib.tests.branch_implementations.test_branch',
44
143
        'bzrlib.tests.branch_implementations.test_break_lock',
 
144
        'bzrlib.tests.branch_implementations.test_create_checkout',
 
145
        'bzrlib.tests.branch_implementations.test_commit',
 
146
        'bzrlib.tests.branch_implementations.test_get_revision_id_to_revno_map',
 
147
        'bzrlib.tests.branch_implementations.test_hooks',
45
148
        'bzrlib.tests.branch_implementations.test_http',
 
149
        'bzrlib.tests.branch_implementations.test_last_revision_info',
46
150
        'bzrlib.tests.branch_implementations.test_locking',
47
151
        'bzrlib.tests.branch_implementations.test_parent',
48
152
        'bzrlib.tests.branch_implementations.test_permissions',
49
153
        'bzrlib.tests.branch_implementations.test_pull',
 
154
        'bzrlib.tests.branch_implementations.test_push',
 
155
        'bzrlib.tests.branch_implementations.test_revision_history',
 
156
        'bzrlib.tests.branch_implementations.test_revision_id_to_revno',
 
157
        'bzrlib.tests.branch_implementations.test_sprout',
 
158
        'bzrlib.tests.branch_implementations.test_tags',
 
159
        'bzrlib.tests.branch_implementations.test_uncommit',
50
160
        'bzrlib.tests.branch_implementations.test_update',
51
161
        ]
 
162
    # Generate a list of branch formats and their associated bzrdir formats to
 
163
    # use.
 
164
    combinations = [(format, format._matchingbzrdir) for format in 
 
165
         BranchFormat._formats.values() + _legacy_formats]
52
166
    adapter = BranchTestProviderAdapter(
53
 
        default_transport,
 
167
        # None here will cause the default vfs transport server to be used.
 
168
        None,
54
169
        # None here will cause a readonly decorator to be created
55
170
        # by the TestCaseWithTransport.get_readonly_transport method.
56
171
        None,
57
 
        [(format, format._matchingbzrdir) for format in 
58
 
         BranchFormat._formats.values() + _legacy_formats])
59
 
    loader = TestLoader()
60
 
    adapt_modules(test_branch_implementations, adapter, loader, result)
 
172
        combinations)
 
173
    loader = tests.TestLoader()
 
174
    tests.adapt_modules(test_branch_implementations, adapter, loader, result)
 
175
 
 
176
    adapt_to_smart_server = BranchTestProviderAdapter(
 
177
        SmartTCPServer_for_testing,
 
178
        ReadonlySmartTCPServer_for_testing,
 
179
        [(RemoteBranchFormat(), RemoteBzrDirFormat())],
 
180
        MemoryServer
 
181
        )
 
182
    tests.adapt_modules(test_branch_implementations,
 
183
                        adapt_to_smart_server,
 
184
                        loader,
 
185
                        result)
 
186
 
61
187
    return result