← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_controldir/__init__.py
35
35
 
36
36
 
37
37
def make_scenarios(vfs_factory, transport_server, transport_readonly_server,
38
 
                   formats, name_suffix=''):
 
38
    formats, name_suffix=''):
39
39
    """Transform the input to a list of scenarios.
40
40
 
41
41
    :param formats: A list of bzrdir_format objects.
67
67
            self.bzrdir = self.make_bzrdir(None)
68
68
        return self.bzrdir
69
69
 
70
 
    def get_default_format(self):
71
 
        return self.bzrdir_format
 
70
    def make_bzrdir(self, relpath, format=None):
 
71
        if format is None:
 
72
            format = self.bzrdir_format
 
73
        return super(TestCaseWithControlDir, self).make_bzrdir(
 
74
            relpath, format=format)
72
75
 
73
76
 
74
77
def load_tests(standard_tests, module, loader):
75
78
    test_per_controldir = [
76
79
        'bzrlib.tests.per_controldir.test_controldir',
77
 
        'bzrlib.tests.per_controldir.test_format',
78
80
        'bzrlib.tests.per_controldir.test_push',
79
81
        ]
80
82
    submod_tests = loader.loadTestsFromModuleNames(test_per_controldir)