← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2010-08-31 08:25:15 UTC
  • mfrom: (5247.7.1 catch-them-all)
  • mto: This revision was merged to the branch mainline in revision 5400.
  • Revision ID: v.ladeuil+lp@free.fr-20100831082515-an9mtdmhalo7xaq0
Merge catch-them-all into more-ignored-exceptions

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/__init__.py
33
33
                           )
34
34
from bzrlib.remote import RemoteBranchFormat, RemoteBzrDirFormat
35
35
from bzrlib.tests import test_server
36
 
from bzrlib.tests.per_bzrdir.test_bzrdir import TestCaseWithBzrDir
 
36
from bzrlib.tests.per_controldir.test_controldir import TestCaseWithControlDir
37
37
from bzrlib.transport import memory
38
38
 
39
39
 
60
60
    return result
61
61
 
62
62
 
63
 
class TestCaseWithBranch(TestCaseWithBzrDir):
 
63
class TestCaseWithBranch(TestCaseWithControlDir):
64
64
    """This helper will be parameterised in each per_branch test."""
65
65
 
66
66
    def setUp(self):
74
74
 
75
75
    def make_branch(self, relpath, format=None):
76
76
        if format is not None:
77
 
            return TestCaseWithBzrDir.make_branch(self, relpath, format)
 
77
            return TestCaseWithControlDir.make_branch(self, relpath, format)
78
78
        repo = self.make_repository(relpath)
79
79
        # fixme RBC 20060210 this isnt necessarily a fixable thing,
80
80
        # Skipped is the wrong exception to raise.