Rev 3024: Handle packs in blackbox.test_reconcile. in http://people.ubuntu.com/~robertc/baz2.0/pack.read-locks

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/pack.read-locks

------------------------------------------------------------
revno: 3024
revision-id:robertc at robertcollins.net-20071122020949-kpvph7srqw3h60p1
parent: robertc at robertcollins.net-20071122020018-a30xrdfzxfwi8g2h
committer: Robert Collins <robertc at robertcollins.net>
branch nick: pack.read-locks
timestamp: Thu 2007-11-22 13:09:49 +1100
message:
  Handle packs in blackbox.test_reconcile.
modified:
  bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
=== modified file 'bzrlib/tests/blackbox/test_reconcile.py'
--- a/bzrlib/tests/blackbox/test_reconcile.py	2007-10-03 06:37:01 +0000
+++ b/bzrlib/tests/blackbox/test_reconcile.py	2007-11-22 02:09:49 +0000
@@ -42,10 +42,15 @@
     def test_trivial_reconcile(self):
         t = bzrdir.BzrDir.create_standalone_workingtree('.')
         (out, err) = self.run_bzr('reconcile')
+        if t.branch.repository._reconcile_backsup_inventory:
+            does_backup_text = "Inventory ok.\n"
+        else:
+            does_backup_text = ""
         self.assertEqualDiff(out, "Reconciling repository %s\n"
-                                  "Inventory ok.\n"
+                                  "%s"
                                   "Reconciliation complete.\n" %
-                                  t.bzrdir.root_transport.base)
+                                  (t.bzrdir.root_transport.base,
+                                   does_backup_text))
         self.assertEqualDiff(err, "")
 
     def test_does_something_reconcile(self):
@@ -60,9 +65,15 @@
         repo.commit_write_group()
         repo.unlock()
         (out, err) = self.run_bzr('reconcile')
-        self.assertEqualDiff(out, "Reconciling repository %s\n"
-                                  "Backup Inventory created.\n"
-                                  "Inventory regenerated.\n"
-                                  "Reconciliation complete.\n" %
-                                  t.bzrdir.root_transport.base)
+        if repo._reconcile_backsup_inventory:
+            does_backup_text = (
+                "Backup Inventory created.\n"
+                "Inventory regenerated.\n")
+        else:
+            does_backup_text = ""
+        expected = ("Reconciling repository %s\n"
+                    "%s"
+                    "Reconciliation complete.\n" %
+                    (t.bzrdir.root_transport.base, does_backup_text))
+        self.assertEqualDiff(expected, out)
         self.assertEqualDiff(err, "")