Rev 3397: Update some tests to pass with the branch checks. in http://bzr.arbash-meinel.com/branches/bzr/1.5-dev/reconcile_rev_history_177855

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.5-dev/reconcile_rev_history_177855

------------------------------------------------------------
revno: 3397
revision-id: john at arbash-meinel.com-20080430150249-viu4vgzglhfu7k7y
parent: john at arbash-meinel.com-20080430133215-t1x69j3vg01yu3i0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reconcile_rev_history_177855
timestamp: Wed 2008-04-30 10:02:49 -0500
message:
  Update some tests to pass with the branch checks.
modified:
  bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
  bzrlib/tests/test_reconcile.py test_reconcile.py-20060225054842-50aa618584a86f26
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_reconcile.py'
--- a/bzrlib/tests/blackbox/test_reconcile.py	2007-11-22 02:09:49 +0000
+++ b/bzrlib/tests/blackbox/test_reconcile.py	2008-04-30 15:02:49 +0000
@@ -46,10 +46,13 @@
             does_backup_text = "Inventory ok.\n"
         else:
             does_backup_text = ""
-        self.assertEqualDiff(out, "Reconciling repository %s\n"
+        self.assertEqualDiff(out, "Reconciling branch %s\n"
+                                  "revision_history ok.\n"
+                                  "Reconciling repository %s\n"
                                   "%s"
                                   "Reconciliation complete.\n" %
-                                  (t.bzrdir.root_transport.base,
+                                  (t.branch.base,
+                                   t.bzrdir.root_transport.base,
                                    does_backup_text))
         self.assertEqualDiff(err, "")
 
@@ -71,9 +74,13 @@
                 "Inventory regenerated.\n")
         else:
             does_backup_text = ""
-        expected = ("Reconciling repository %s\n"
+        expected = ("Reconciling branch %s\n"
+                    "revision_history ok.\n"
+                    "Reconciling repository %s\n"
                     "%s"
                     "Reconciliation complete.\n" %
-                    (t.bzrdir.root_transport.base, does_backup_text))
+                    (t.branch.base,
+                     t.bzrdir.root_transport.base,
+                     does_backup_text))
         self.assertEqualDiff(expected, out)
         self.assertEqualDiff(err, "")

=== modified file 'bzrlib/tests/test_reconcile.py'
--- a/bzrlib/tests/test_reconcile.py	2008-04-29 16:31:58 +0000
+++ b/bzrlib/tests/test_reconcile.py	2008-04-30 15:02:49 +0000
@@ -50,17 +50,18 @@
     def test_reconciler_with_no_branch(self):
         repo = self.make_repository('repo')
         reconciler = Reconciler(repo.bzrdir)
-        reconcile(reconciler)
+        reconciler.reconcile()
         # no inconsistent parents should have been found
         # but the values should have been set.
         self.assertEqual(0, reconciler.inconsistent_parents)
         # and no garbage inventories
         self.assertEqual(0, reconciler.garbage_inventories)
+        self.assertIs(None, reconciler.fixed_branch_history)
 
     def test_reconciler_finds_branch(self):
         a_branch = self.make_branch('a_branch')
         reconciler = Reconciler(a_branch.bzrdir)
-        reconcile(reconciler)
+        reconciler.reconcile()
 
         # It should have checked the repository, and the branch
         self.assertEqual(0, reconciler.inconsistent_parents)