Rev 4714: Actually there was a semi-whitebox test, now updated. in http://bazaar.launchpad.net/~jameinel/bzr/2.0-40412-show-base-weave

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.0-40412-show-base-weave

------------------------------------------------------------
revno: 4714
revision-id: john at arbash-meinel.com-20091208202829-wuuzjx2xul8xzsrb
parent: john at arbash-meinel.com-20091208202623-p5f5du15g6zjz1wk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.0-40412-show-base-weave
timestamp: Tue 2009-12-08 14:28:29 -0600
message:
  Actually there was a semi-whitebox test, now updated.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_merge_core.py'
--- a/bzrlib/tests/test_merge_core.py	2009-08-20 04:09:58 +0000
+++ b/bzrlib/tests/test_merge_core.py	2009-12-08 20:28:29 +0000
@@ -481,16 +481,16 @@
         wtb = d_b.open_workingtree()
         wtb.commit('this revision', allow_pointless=False)
         self.assertEqual(1, wtb.merge_from_branch(wta.branch))
-        self.assert_(os.path.lexists('b/file.THIS'))
-        self.assert_(os.path.lexists('b/file.BASE'))
-        self.assert_(os.path.lexists('b/file.OTHER'))
+        self.failUnlessExists('b/file.THIS')
+        self.failUnlessExists('b/file.BASE')
+        self.failUnlessExists('b/file.OTHER')
         wtb.revert()
         self.assertEqual(1, wtb.merge_from_branch(wta.branch,
                                                   merge_type=WeaveMerger))
-        self.assert_(os.path.lexists('b/file'))
-        self.assert_(os.path.lexists('b/file.THIS'))
-        self.assert_(not os.path.lexists('b/file.BASE'))
-        self.assert_(os.path.lexists('b/file.OTHER'))
+        self.failUnlessExists('b/file')
+        self.failUnlessExists('b/file.THIS')
+        self.failUnlessExists('b/file.BASE')
+        self.failUnlessExists('b/file.OTHER')
 
     def test_merge_unrelated(self):
         """Sucessfully merges unrelated branches with no common names"""