Rev 5647: Last missing fixes probably not covered in trunk because the tests have been deleted there. in http://bazaar.launchpad.net/~vila/bzr/2.3-integration/

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/2.3-integration/

------------------------------------------------------------
revno: 5647
revision-id: v.ladeuil+lp at free.fr-20110513122607-4hwo8kup7ec2ebsm
parent: v.ladeuil+lp at free.fr-20110513113444-h0kx3p4z6228v8r8
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.3.3-dev
timestamp: Fri 2011-05-13 14:26:07 +0200
message:
  Last missing fixes probably not covered in trunk because the tests have been deleted there.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_sftp_transport.py'
--- a/bzrlib/tests/test_sftp_transport.py	2011-05-13 11:34:44 +0000
+++ b/bzrlib/tests/test_sftp_transport.py	2011-05-13 12:26:07 +0000
@@ -193,15 +193,15 @@
         # old format branches use a special lock file on sftp.
         b = self.make_branch('', format=bzrdir.BzrDirFormat6())
         b = bzrlib.branch.Branch.open(self.get_url())
-        self.failUnlessExists('.bzr/')
-        self.failUnlessExists('.bzr/branch-format')
-        self.failUnlessExists('.bzr/branch-lock')
+        self.assertPathExists('.bzr/')
+        self.assertPathExists('.bzr/branch-format')
+        self.assertPathExists('.bzr/branch-lock')
 
-        self.failIf(lexists('.bzr/branch-lock.write-lock'))
+        self.assertPathDoesNotExist('.bzr/branch-lock.write-lock')
         b.lock_write()
-        self.failUnlessExists('.bzr/branch-lock.write-lock')
+        self.assertPathExists('.bzr/branch-lock.write-lock')
         b.unlock()
-        self.failIf(lexists('.bzr/branch-lock.write-lock'))
+        self.assertPathDoesNotExist('.bzr/branch-lock.write-lock')
 
     def test_push_support(self):
         self.build_tree(['a/', 'a/foo'])

=== modified file 'bzrlib/tests/test_upgrade.py'
--- a/bzrlib/tests/test_upgrade.py	2011-05-13 11:34:44 +0000
+++ b/bzrlib/tests/test_upgrade.py	2011-05-13 12:26:07 +0000
@@ -43,10 +43,9 @@
         control = bzrdir.BzrDir.open('.')
         b = control.open_branch()
         # tsk, peeking under the covers.
-        self.failUnless(
-            isinstance(
+        self.assertIsInstance(
                 control._format,
-                bzrdir.BzrDirFormat.get_default_format().__class__))
+                bzrdir.BzrDirFormat.get_default_format().__class__)
         rh = b.revision_history()
         eq(rh,
            ['mbp at sourcefrog.net-20051004035611-176b16534b086b3c',
@@ -153,7 +152,7 @@
         # We have covered the scope of this test, we may as well check that
         # upgrade has not eaten our data, even if it's a bit redundant with
         # other tests.
-        self.failUnless(isinstance(control._format, bzrdir.BzrDirMetaFormat1))
+        self.assertIsInstance(control._format, bzrdir.BzrDirMetaFormat1)
         b = control.open_branch()
         self.assertEquals(b.revision_history(),
            ['mbp at sourcefrog.net-20051004035611-176b16534b086b3c',