Merge lp:~mbp/bzr/408199-check-2a into lp:~bzr/bzr/trunk-old

[Martin Pool]

[Martin Pool (mbp)]

Fairly straightforward fix: the blackbox tests should cope with the root id possibly being displayed in the count of file ids.

[Robert Collins (lifeless)]

 review +1

review: Approve

=== modified file 'NEWS'
--- NEWS	2009-08-03 04:47:16 +0000
+++ NEWS	2009-08-03 07:35:22 +0000
@@ -160,6 +160,12 @@
 * --subunit support now adds timestamps if the subunit version supports
   it. (Robert Collins)
 
+Testing
+*******
+
+* Spurious failure in ``check`` tests on rich-root formats fixed.
+  (Martin Pool, #408199)
+
 * The ``bzrlib.tests.TextTestRunner`` will no longer call
   ``countTestsCases`` on the test being run. Progress information is
   instead handled by having the test passed in call ``result.progress``

=== modified file 'bzrlib/tests/blackbox/test_check.py'
--- bzrlib/tests/blackbox/test_check.py	2009-03-23 14:59:43 +0000
+++ bzrlib/tests/blackbox/test_check.py	2009-08-03 07:35:22 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 Canonical Ltd
+# Copyright (C) 2007, 2009 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -34,11 +34,12 @@
         tree = self.make_branch_and_tree('.')
         tree.commit('hallelujah')
         out, err = self.run_bzr('check')
+        # the root directory may be in the texts for rich root formats
         self.assertContainsRe(err, r"^Checking working tree at '.*'\.\n"
                                    r"Checking repository at '.*'\.\n"
                                    r"checked repository.*\n"
                                    r"     1 revisions\n"
-                                   r"     0 file-ids\n"
+                                   r"     [01] file-ids\n"
                                    r"     0 unique file texts\n"
                                    r"     0 repeated file texts\n"
                                    r"     0 unreferenced text versions\n"
@@ -59,7 +60,7 @@
         self.assertContainsRe(err, r"^Checking repository at '.*'\.\n"
                                    r"checked repository.*\n"
                                    r"     1 revisions\n"
-                                   r"     0 file-ids\n"
+                                   r"     [01] file-ids\n"
                                    r"     0 unique file texts\n"
                                    r"     0 repeated file texts\n"
                                    r"     0 unreferenced text versions$")