Rev 4595: (mbp) small tweak to bundle_info tests in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4595 [merge]
revision-id: pqm at pqm.ubuntu.com-20090807010459-nw1f0r9y1igi19xf
parent: pqm at pqm.ubuntu.com-20090807000320-pq3jv5593sqmoy8x
parent: mbp at sourcefrog.net-20090806052004-22edm2oradkpm0xk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-08-07 02:04:59 +0100
message:
  (mbp) small tweak to bundle_info tests
modified:
  bzrlib/tests/blackbox/test_bundle_info.py test_bundle_info.py-20070816181255-eiuodwxuqu7w7gxf-1
=== modified file 'bzrlib/tests/blackbox/test_bundle_info.py'
--- a/bzrlib/tests/blackbox/test_bundle_info.py	2009-03-23 14:59:43 +0000
+++ b/bzrlib/tests/blackbox/test_bundle_info.py	2009-08-06 05:20:04 +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
@@ -35,7 +35,9 @@
         finally:
             bundle.close()
         info = self.run_bzr('bundle-info bundle')[0]
-        self.assertContainsRe(info, 'file: 1 .0 multiparent.')
+        # there might be either one file, or two, depending on whether the
+        # tree root counts...
+        self.assertContainsRe(info, 'file: [12] .0 multiparent.')
         self.assertContainsRe(info, 'nicks: source')
         self.assertNotContainsRe(info, 'foo')
         self.run_bzr_error(['--verbose requires a merge directive'],