← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-04-11 22:45:46 UTC
  • mfrom: (4286.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090411224546-82f5xlgs2r51k164
(vila)(trivial) Cleanup test imports and use features to better track
        skipped tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/__init__.py
22
22
rather than in tests/workingtree_implementations/*.py.
23
23
"""
24
24
 
25
 
import bzrlib.errors as errors
26
 
from bzrlib.transport import get_transport
27
 
from bzrlib.tests import (
28
 
                          default_transport,
29
 
                          multiply_tests,
30
 
                          )
31
 
from bzrlib.tests.bzrdir_implementations.test_bzrdir import TestCaseWithBzrDir
32
 
from bzrlib.workingtree import (WorkingTreeFormat,
33
 
                                _legacy_formats,
34
 
                                )
 
25
from bzrlib import (
 
26
    errors,
 
27
    tests,
 
28
    workingtree,
 
29
    )
 
30
from bzrlib.tests import bzrdir_implementations
35
31
 
36
32
 
37
33
def make_scenarios(transport_server, transport_readonly_server, formats):
38
 
    """Create a scenario for the specified converter
39
 
 
40
 
    :param workingtree_format: The particular workingtree format to test.
41
 
    :param bzrdir_format: The bzrdir format to test.
42
 
    :return: a (name, options) tuple, where options is a dict of values
43
 
        to be used as members of the TestCase.
44
 
    """
45
34
    result = []
46
35
    for workingtree_format in formats:
47
36
        result.append((workingtree_format.__class__.__name__,
48
 
            make_scenario(transport_server, transport_readonly_server,
49
 
            workingtree_format)))
 
37
                       make_scenario(transport_server,
 
38
                                     transport_readonly_server,
 
39
                                     workingtree_format)))
50
40
    return result
51
41
 
52
42
 
53
43
def make_scenario(transport_server, transport_readonly_server,
54
 
    workingtree_format):
 
44
                  workingtree_format):
55
45
    return {
56
46
        "transport_server": transport_server,
57
47
        "transport_readonly_server": transport_readonly_server,
60
50
        }
61
51
 
62
52
 
63
 
class TestCaseWithWorkingTree(TestCaseWithBzrDir):
 
53
class TestCaseWithWorkingTree(bzrdir_implementations.TestCaseWithBzrDir):
64
54
 
65
55
    def make_branch_and_tree(self, relpath, format=None):
66
56
        made_control = self.make_bzrdir(relpath, format=format)
112
102
        ]
113
103
 
114
104
    scenarios = make_scenarios(
115
 
        default_transport,
 
105
        tests.default_transport,
116
106
        # None here will cause a readonly decorator to be created
117
107
        # by the TestCaseWithTransport.get_readonly_transport method.
118
108
        None,
119
 
        WorkingTreeFormat._formats.values() + _legacy_formats)
 
109
        workingtree.WorkingTreeFormat._formats.values()
 
110
        + workingtree._legacy_formats)
120
111
 
121
112
    # add the tests for the sub modules
122
 
    return multiply_tests(
 
113
    return tests.multiply_tests(
123
114
        loader.loadTestsFromModuleNames(test_workingtree_implementations),
124
115
        scenarios, standard_tests)