← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2010-08-21 16:06:24 UTC
  • mto: This revision was merged to the branch mainline in revision 5389.
  • Revision ID: jelmer@samba.org-20100821160624-qer8toywwwxeqkmx
Rename TestCaseWithBzrDir -> TestCaseWithControlDir.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_controldir/test_controldir.py
54
54
                          TestNotApplicable,
55
55
                          TestSkipped,
56
56
                          )
57
 
from bzrlib.tests.per_controldir import TestCaseWithBzrDir
58
 
from bzrlib.trace import mutter
 
57
from bzrlib.tests.per_controldir import TestCaseWithControlDir
59
58
from bzrlib.transport.local import LocalTransport
60
59
from bzrlib.ui import (
61
60
    CannedInputUIFactory,
62
61
    )
63
 
from bzrlib.upgrade import upgrade
64
62
from bzrlib.remote import RemoteBzrDir, RemoteRepository
65
63
from bzrlib.repofmt import weaverepo
66
64
 
67
65
 
68
 
class TestBzrDir(TestCaseWithBzrDir):
 
66
class TestBzrDir(TestCaseWithControlDir):
69
67
    # Many of these tests test for disk equality rather than checking
70
68
    # for semantic equivalence. This works well for some tests but
71
69
    # is not good at handling changes in representation or the addition
1837
1835
            bd.retire_bzrdir, limit=0)
1838
1836
 
1839
1837
 
1840
 
class TestBreakLock(TestCaseWithBzrDir):
 
1838
class TestBreakLock(TestCaseWithControlDir):
1841
1839
 
1842
1840
    def test_break_lock_empty(self):
1843
1841
        # break lock on an empty bzrdir should work silently.
1945
1943
        self.assertRaises(errors.LockBroken, tree.unlock)
1946
1944
 
1947
1945
 
1948
 
class TestTransportConfig(TestCaseWithBzrDir):
 
1946
class TestTransportConfig(TestCaseWithControlDir):
1949
1947
 
1950
1948
    def test_get_config(self):
1951
1949
        my_dir = self.make_bzrdir('.')
1995
1993
                          made_control.find_repository)
1996
1994
 
1997
1995
 
1998
 
class TestBzrDirControlComponent(TestCaseWithBzrDir):
 
1996
class TestBzrDirControlComponent(TestCaseWithControlDir):
1999
1997
    """BzrDir implementations adequately implement ControlComponent."""
2000
1998
 
2001
1999
    def test_urls(self):