Rev 6247: (gz) Prevent random test failure by allowing intermingled tracebacks in in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6247 [merge]
revision-id: pqm at pqm.ubuntu.com-20111108173529-v2vebrv4xiw7euqk
parent: pqm at pqm.ubuntu.com-20111108162931-e72e84b4bviq0u4m
parent: martin.packman at canonical.com-20111108170723-ys88gzmjz9sh2k15
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2011-11-08 17:35:29 +0000
message:
  (gz) Prevent random test failure by allowing intermingled tracebacks in
   test_error_in_child_during_fork (Martin Packman)
modified:
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py	2011-10-26 16:48:58 +0000
+++ b/bzrlib/tests/test_selftest.py	2011-11-08 17:07:23 +0000
@@ -3354,10 +3354,16 @@
         # We don't care what, just break something that a child will run
         self.overrideAttr(tests, "workaround_zealous_crypto_random", None)
         out = self._run_selftest(test_suite_factory=Test)
+        # Lines from the tracebacks of the two child processes may be mixed
+        # together due to the way subunit parses and forwards the streams,
+        # so permit extra lines between each part of the error output.
         self.assertContainsRe(out,
             "Traceback.*:\n"
+            "(?:.*\n)*"
             ".+ in fork_for_tests\n"
+            "(?:.*\n)*"
             "\s*workaround_zealous_crypto_random\(\)\n"
+            "(?:.*\n)*"
             "TypeError:")