← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_bzrdir/__init__.py
49
49
            self.bzrdir = self.make_bzrdir(None)
50
50
        return self.bzrdir
51
51
 
52
 
    def make_bzrdir(self, relpath, format=None):
53
 
        if format is None:
54
 
            format = self.bzrdir_format
55
 
        return super(TestCaseWithBzrDir, self).make_bzrdir(
56
 
            relpath, format=format)
 
52
    def get_default_format(self):
 
53
        return self.bzrdir_format
57
54
 
58
55
 
59
56
def load_tests(standard_tests, module, loader):