← 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: Patch Queue Manager
  • Date: 2016-01-15 09:21:49 UTC
  • mfrom: (6606.2.1 autodoc-unicode)
  • Revision ID: pqm@pqm.ubuntu.com-20160115092149-z5f4sfq3jvaz0enb
(vila) Fix autodoc runner when LANG=C. (Jelmer Vernooij)

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 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)
 
70
    def get_default_format(self):
 
71
        return self.bzrdir_format
75
72
 
76
73
 
77
74
def load_tests(standard_tests, module, loader):
78
75
    test_per_controldir = [
79
76
        'bzrlib.tests.per_controldir.test_controldir',
 
77
        'bzrlib.tests.per_controldir.test_format',
80
78
        'bzrlib.tests.per_controldir.test_push',
81
79
        ]
82
80
    submod_tests = loader.loadTestsFromModuleNames(test_per_controldir)