← 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: Jelmer Vernooij
  • Date: 2012-02-20 12:19:29 UTC
  • mfrom: (6437.23.11 2.5)
  • mto: (6581.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6582.
  • Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_controldir/__init__.py
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):