/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Jonathan Lange
  • Date: 2009-12-09 09:20:42 UTC
  • mfrom: (4881 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4907.
  • Revision ID: jml@canonical.com-20091209092042-s2zgqcf8f39yzxpj
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/__init__.py
21
21
 
22
22
These test the conformance of all the branch variations to the expected API.
23
23
Specific tests for individual formats are in the tests/test_branch file
24
 
rather than in tests/branch_implementations/*.py.
 
24
rather than in tests/per_branch/*.py.
25
25
"""
26
26
 
27
27
from bzrlib import (
38
38
    SmartTCPServer_for_testing,
39
39
    SmartTCPServer_for_testing_v2_only,
40
40
    )
41
 
from bzrlib.tests.bzrdir_implementations.test_bzrdir import TestCaseWithBzrDir
 
41
from bzrlib.tests.per_bzrdir.test_bzrdir import TestCaseWithBzrDir
42
42
from bzrlib.transport.memory import MemoryServer
43
43
 
44
44
 
78
78
        return self.branch
79
79
 
80
80
    def make_branch(self, relpath, format=None):
81
 
        repo = self.make_repository(relpath, format=format)
 
81
        if format is not None:
 
82
            return TestCaseWithBzrDir.make_branch(self, relpath, format)
 
83
        repo = self.make_repository(relpath)
82
84
        # fixme RBC 20060210 this isnt necessarily a fixable thing,
83
85
        # Skipped is the wrong exception to raise.
84
86
        try:
163
165
 
164
166
 
165
167
def load_tests(standard_tests, module, loader):
166
 
    test_branch_implementations = [
167
 
        'bzrlib.tests.branch_implementations.test_bound_sftp',
168
 
        'bzrlib.tests.branch_implementations.test_branch',
169
 
        'bzrlib.tests.branch_implementations.test_break_lock',
170
 
        'bzrlib.tests.branch_implementations.test_check',
171
 
        'bzrlib.tests.branch_implementations.test_create_checkout',
172
 
        'bzrlib.tests.branch_implementations.test_create_clone',
173
 
        'bzrlib.tests.branch_implementations.test_commit',
174
 
        'bzrlib.tests.branch_implementations.test_dotted_revno_to_revision_id',
175
 
        'bzrlib.tests.branch_implementations.test_get_revision_id_to_revno_map',
176
 
        'bzrlib.tests.branch_implementations.test_hooks',
177
 
        'bzrlib.tests.branch_implementations.test_http',
178
 
        'bzrlib.tests.branch_implementations.test_iter_merge_sorted_revisions',
179
 
        'bzrlib.tests.branch_implementations.test_last_revision_info',
180
 
        'bzrlib.tests.branch_implementations.test_locking',
181
 
        'bzrlib.tests.branch_implementations.test_parent',
182
 
        'bzrlib.tests.branch_implementations.test_permissions',
183
 
        'bzrlib.tests.branch_implementations.test_pull',
184
 
        'bzrlib.tests.branch_implementations.test_push',
185
 
        'bzrlib.tests.branch_implementations.test_reconcile',
186
 
        'bzrlib.tests.branch_implementations.test_revision_history',
187
 
        'bzrlib.tests.branch_implementations.test_revision_id_to_dotted_revno',
188
 
        'bzrlib.tests.branch_implementations.test_revision_id_to_revno',
189
 
        'bzrlib.tests.branch_implementations.test_sprout',
190
 
        'bzrlib.tests.branch_implementations.test_stacking',
191
 
        'bzrlib.tests.branch_implementations.test_tags',
192
 
        'bzrlib.tests.branch_implementations.test_uncommit',
193
 
        'bzrlib.tests.branch_implementations.test_update',
 
168
    per_branch_mod_names = [
 
169
        'bound_sftp',
 
170
        'branch',
 
171
        'break_lock',
 
172
        'check',
 
173
        'create_checkout',
 
174
        'create_clone',
 
175
        'commit',
 
176
        'dotted_revno_to_revision_id',
 
177
        'get_revision_id_to_revno_map',
 
178
        'hooks',
 
179
        'http',
 
180
        'iter_merge_sorted_revisions',
 
181
        'last_revision_info',
 
182
        'locking',
 
183
        'parent',
 
184
        'permissions',
 
185
        'pull',
 
186
        'push',
 
187
        'reconcile',
 
188
        'revision_history',
 
189
        'revision_id_to_dotted_revno',
 
190
        'revision_id_to_revno',
 
191
        'sprout',
 
192
        'stacking',
 
193
        'tags',
 
194
        'uncommit',
 
195
        'update',
194
196
        ]
195
 
    sub_tests = loader.loadTestsFromModuleNames(test_branch_implementations)
 
197
    sub_tests = loader.loadTestsFromModuleNames(
 
198
        ['bzrlib.tests.per_branch.test_' + name
 
199
         for name in per_branch_mod_names])
196
200
    return tests.multiply_tests(sub_tests, branch_scenarios(), standard_tests)