Rev 3057: Fix up the is_ancestor checks in test_revision.py in http://bzr.arbash-meinel.com/branches/bzr/0.93-dev/is_ancestor_fix

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/0.93-dev/is_ancestor_fix

------------------------------------------------------------
revno: 3057
revision-id:john at arbash-meinel.com-20071130154827-dh5a4gr3d0gfk1m0
parent: john at arbash-meinel.com-20071130152015-7zu3hejdrx5j2reo
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: is_ancestor_fix
timestamp: Fri 2007-11-30 09:48:27 -0600
message:
  Fix up the is_ancestor checks in test_revision.py
modified:
  bzrlib/tests/test_revision.py  testrevision.py-20050804210559-46f5e1eb67b01289
-------------- next part --------------
=== modified file 'bzrlib/tests/test_revision.py'
--- a/bzrlib/tests/test_revision.py	2007-08-28 06:43:19 +0000
+++ b/bzrlib/tests/test_revision.py	2007-11-30 15:48:27 +0000
@@ -28,6 +28,7 @@
                              common_ancestor,
                              is_ancestor, MultipleRevisionSources,
                              NULL_REVISION)
+from bzrlib.symbol_versioning import zero_ninetythree
 from bzrlib.tests import TestCase, TestCaseWithTransport
 from bzrlib.trace import mutter
 from bzrlib.workingtree import WorkingTree
@@ -132,16 +133,28 @@
         revisions_2 = br2.revision_history()
         sources = br1
 
-        self.assert_(is_ancestor(revisions[0], revisions[0], br1))
-        self.assert_(is_ancestor(revisions[1], revisions[0], sources))
-        self.assert_(not is_ancestor(revisions[0], revisions[1], sources))
-        self.assert_(is_ancestor(revisions_2[3], revisions[0], sources))
+        br1.lock_read()
+        self.addCleanup(br1.unlock)
+        br2.lock_read()
+        self.addCleanup(br2.unlock)
+
+        self.assertTrue(self.applyDeprecated(zero_ninetythree,
+                        is_ancestor, revisions[0], revisions[0], br1))
+        self.assertTrue(self.applyDeprecated(zero_ninetythree,
+                        is_ancestor, revisions[1], revisions[0], sources))
+        self.assertFalse(self.applyDeprecated(zero_ninetythree,
+                         is_ancestor, revisions[0], revisions[1], sources))
+        self.assertTrue(self.applyDeprecated(zero_ninetythree,
+                        is_ancestor, revisions_2[3], revisions[0], sources))
         # disabled mbp 20050914, doesn't seem to happen anymore
         ## self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
         ##                  revisions[0], br1)        
-        self.assert_(is_ancestor(revisions[3], revisions_2[4], sources))
-        self.assert_(is_ancestor(revisions[3], revisions_2[4], br1))
-        self.assert_(is_ancestor(revisions[3], revisions_2[3], sources))
+        self.assertTrue(self.applyDeprecated(zero_ninetythree,
+                        is_ancestor, revisions[3], revisions_2[4], sources))
+        self.assertTrue(self.applyDeprecated(zero_ninetythree,
+                        is_ancestor, revisions[3], revisions_2[4], br1))
+        self.assertTrue(self.applyDeprecated(zero_ninetythree,
+                        is_ancestor, revisions[3], revisions_2[3], sources))
         ## self.assert_(not is_ancestor(revisions[3], revisions_2[3], br1))