Rev 4864: (vila) Fix a test timing-dependency issue in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4864 [merge]
revision-id: pqm at pqm.ubuntu.com-20091204114110-hdb893ip8y4idj1g
parent: pqm at pqm.ubuntu.com-20091204105949-cp822ctg4bp7vgd4
parent: v.ladeuil+lp at free.fr-20091204105830-07rhhsyg4aqn54ew
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-12-04 11:41:10 +0000
message:
  (vila) Fix a test timing-dependency issue
modified:
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py	2009-11-24 02:25:23 +0000
+++ b/bzrlib/tests/test_selftest.py	2009-12-04 09:09:18 +0000
@@ -922,8 +922,10 @@
         result.report_unsupported(test, feature)
         output = result_stream.getvalue()[prefix:]
         lines = output.splitlines()
-        self.assertEqual(lines, ['NODEP        0ms',
-                                 "    The feature 'Feature' is not available."])
+        # We don't check for the final '0ms' since it may fail on slow hosts
+        self.assertStartsWith(lines[0], 'NODEP')
+        self.assertEqual(lines[1],
+                         "    The feature 'Feature' is not available.")
 
     def test_unavailable_exception(self):
         """An UnavailableFeature being raised should invoke addNotSupported."""