Rev 5700: (jelmer) In bzrlib.tests.per_controldir allow new control directories to not in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5700 [merge]
revision-id: pqm at pqm.ubuntu.com-20110306230216-1grz5vqxuq6z1jc8
parent: pqm at pqm.ubuntu.com-20110304234108-ihelbiv17knov1cr
parent: jelmer at samba.org-20110306003301-b7y4app7aejbmla4
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2011-03-06 23:02:16 +0000
message:
  (jelmer) In bzrlib.tests.per_controldir allow new control directories to not
   derive from BzrDir but only from ControlDir. (Jelmer Vernooij)
modified:
  bzrlib/tests/per_controldir/test_controldir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
=== modified file 'bzrlib/tests/per_controldir/test_controldir.py'
--- a/bzrlib/tests/per_controldir/test_controldir.py	2011-03-03 01:03:13 +0000
+++ b/bzrlib/tests/per_controldir/test_controldir.py	2011-03-06 00:33:01 +0000
@@ -1107,7 +1107,7 @@
             # Repositories are open write-locked
             self.assertTrue(repo.is_write_locked())
             self.addCleanup(repo.unlock)
-        self.assertIsInstance(control, bzrdir.BzrDir)
+        self.assertIsInstance(control, controldir.ControlDir)
         opened = bzrdir.BzrDir.open(t.base)
         expected_format = self.bzrdir_format
         if isinstance(expected_format, bzrdir.RemoteBzrDirFormat):