← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-08-21 17:09:54 UTC
  • mfrom: (5385.1.1 trivial-NEWS-fileencoding)
  • Revision ID: pqm@pqm.ubuntu.com-20100821170954-efrj80bvw56s5mzc
(parthm) Remove 'encoding' option from NEWS modeline as its an error in Vim
 7.3+ (Parth Malwankar)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_bzrdir_colo/__init__.py
23
23
run.
24
24
"""
25
25
 
26
 
from bzrlib.controldir import ControlDirFormat
 
26
from bzrlib.bzrdir import BzrDirFormat
27
27
from bzrlib.tests import (
28
28
    default_transport,
29
29
    multiply_tests,
30
30
    )
31
 
from bzrlib.tests.per_controldir import (
32
 
    TestCaseWithControlDir,
 
31
from bzrlib.tests.per_bzrdir import (
 
32
    TestCaseWithBzrDir,
33
33
    make_scenarios,
34
34
    )
35
35
 
37
37
def load_tests(standard_tests, module, loader):
38
38
    colo_supported_formats = []
39
39
    colo_unsupported_formats = []
40
 
    for format in ControlDirFormat.known_formats():
 
40
    for format in BzrDirFormat.known_formats():
41
41
        if format.colocated_branches:
42
42
            colo_supported_formats.append(format)
43
43
        else:
48
48
        colo_unsupported_formats)
49
49
    result = loader.suiteClass()
50
50
    supported_tests = loader.loadTestsFromModuleNames([
51
 
        'bzrlib.tests.per_controldir_colo.test_supported'])
 
51
        'bzrlib.tests.per_bzrdir_colo.test_supported'])
52
52
    unsupported_tests = loader.loadTestsFromModuleNames([
53
 
        'bzrlib.tests.per_controldir_colo.test_unsupported'])
 
53
        'bzrlib.tests.per_bzrdir_colo.test_unsupported'])
54
54
    multiply_tests(supported_tests, supported_scenarios, result)
55
55
    multiply_tests(unsupported_tests, unsupported_scenarios, result)
56
56
    return result