Bazaar

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

  1. 408199-check-2a
  2. Merge into trunk-old
Proposed by Martin Pool
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~mbp/bzr/408199-check-2a
Merge into: lp://staging/~bzr/bzr/trunk-old
Diff against target: 49 lines
To merge this branch: bzr merge lp://staging/~mbp/bzr/408199-check-2a
Reviewer Review Type Date Requested Status
Robert Collins (community) Approve
Review via email: mp+9568@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pool (mbp) wrote :

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

Revision history for this message
Robert Collins (lifeless) wrote :

 review +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2009-08-03 04:47:16 +0000
3+++ NEWS 2009-08-03 07:35:22 +0000
4@@ -160,6 +160,12 @@
5 * --subunit support now adds timestamps if the subunit version supports
6 it. (Robert Collins)
7
8+Testing
9+*******
10+
11+* Spurious failure in ``check`` tests on rich-root formats fixed.
12+ (Martin Pool, #408199)
13+
14 * The ``bzrlib.tests.TextTestRunner`` will no longer call
15 ``countTestsCases`` on the test being run. Progress information is
16 instead handled by having the test passed in call ``result.progress``
17
18=== modified file 'bzrlib/tests/blackbox/test_check.py'
19--- bzrlib/tests/blackbox/test_check.py 2009-03-23 14:59:43 +0000
20+++ bzrlib/tests/blackbox/test_check.py 2009-08-03 07:35:22 +0000
21@@ -1,4 +1,4 @@
22-# Copyright (C) 2007 Canonical Ltd
23+# Copyright (C) 2007, 2009 Canonical Ltd
24 #
25 # This program is free software; you can redistribute it and/or modify
26 # it under the terms of the GNU General Public License as published by
27@@ -34,11 +34,12 @@
28 tree = self.make_branch_and_tree('.')
29 tree.commit('hallelujah')
30 out, err = self.run_bzr('check')
31+ # the root directory may be in the texts for rich root formats
32 self.assertContainsRe(err, r"^Checking working tree at '.*'\.\n"
33 r"Checking repository at '.*'\.\n"
34 r"checked repository.*\n"
35 r" 1 revisions\n"
36- r" 0 file-ids\n"
37+ r" [01] file-ids\n"
38 r" 0 unique file texts\n"
39 r" 0 repeated file texts\n"
40 r" 0 unreferenced text versions\n"
41@@ -59,7 +60,7 @@
42 self.assertContainsRe(err, r"^Checking repository at '.*'\.\n"
43 r"checked repository.*\n"
44 r" 1 revisions\n"
45- r" 0 file-ids\n"
46+ r" [01] file-ids\n"
47 r" 0 unique file texts\n"
48 r" 0 repeated file texts\n"
49 r" 0 unreferenced text versions$")