Rev 4368: Silence a warning in test_bzrdir. in http://people.canonical.com/~robertc/baz2.0/check

Robert Collins robertc at robertcollins.net
Thu Aug 6 01:49:22 BST 2009


At http://people.canonical.com/~robertc/baz2.0/check

------------------------------------------------------------
revno: 4368
revision-id: robertc at robertcollins.net-20090806004850-jhfg8s7xt9vbr3gk
parent: robertc at robertcollins.net-20090805023059-wkw6m0c9fommcwth
committer: Robert Collins <robertc at robertcollins.net>
branch nick: check
timestamp: Thu 2009-08-06 10:48:50 +1000
message:
  Silence a warning in test_bzrdir.
=== modified file 'bzrlib/tests/per_bzrdir/test_bzrdir.py'
--- a/bzrlib/tests/per_bzrdir/test_bzrdir.py	2009-07-17 10:38:41 +0000
+++ b/bzrlib/tests/per_bzrdir/test_bzrdir.py	2009-08-06 00:48:50 +0000
@@ -26,6 +26,7 @@
 import bzrlib.branch
 from bzrlib import (
     bzrdir,
+    check,
     errors,
     lockdir,
     osutils,
@@ -38,7 +39,6 @@
     workingtree,
     )
 from bzrlib.branch import Branch, needs_read_lock, needs_write_lock
-from bzrlib.check import check_branch
 from bzrlib.errors import (FileExists,
                            NoSuchRevision,
                            NoSuchFile,
@@ -1738,8 +1738,7 @@
             finally:
                 pb.finished()
             # and it should pass 'check' now.
-            check_branch(bzrdir.BzrDir.open(self.get_url('.')).open_branch(),
-                         False)
+            check.check_dwim(self.get_url('.'), False, True, True)
 
     def test_format_description(self):
         dir = self.make_bzrdir('.')




More information about the bazaar-commits mailing list