Rev 3418: Fix up a couple of the tests in http://bzr.arbash-meinel.com/branches/bzr/1.4-dev/find_unique_ancestors

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.4-dev/find_unique_ancestors

------------------------------------------------------------
revno: 3418
revision-id: john at arbash-meinel.com-20080501201042-ep7n9ix7ebe5nlpk
parent: john at arbash-meinel.com-20080501200437-yfprhb36wggjq50n
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: find_unique_ancestors
timestamp: Thu 2008-05-01 15:10:42 -0500
message:
  Fix up a couple of the tests
modified:
  bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
  bzrlib/tests/test_status.py    test_status.py-20060516190614-fbf6432e4a6e8aa5
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_status.py'
--- a/bzrlib/tests/blackbox/test_status.py	2008-03-16 15:17:57 +0000
+++ b/bzrlib/tests/blackbox/test_status.py	2008-05-01 20:10:42 +0000
@@ -95,13 +95,13 @@
                 '  bye.c\n',
                 '  hello.c\n',
                 'pending merges:\n',
-                '  pending at pending-0-0\n',
+                '  (ghost) pending at pending-0-0\n',
             ],
             wt)
         self.assertStatus([
                 '?   bye.c\n',
                 '?   hello.c\n',
-                'P   pending at pending-0-0\n',
+                'P   (ghost) pending at pending-0-0\n',
             ],
             wt, short=True)
         self.assertStatus([

=== modified file 'bzrlib/tests/test_status.py'
--- a/bzrlib/tests/test_status.py	2008-05-01 20:04:37 +0000
+++ b/bzrlib/tests/test_status.py	2008-05-01 20:10:42 +0000
@@ -72,6 +72,7 @@
         """Test when a pending merge is itself a ghost"""
         tree = self.make_branch_and_tree('a')
         tree.commit('first')
+        tree2 = tree.bzrdir.clone('b').open_workingtree()
         tree2.add_parent_tree_id('a-ghost-revision')
         tree.lock_read()
         self.addCleanup(tree.unlock)