Rev 4619: (vila) Make selftest --parallel=fork work again in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4619 [merge]
revision-id: pqm at pqm.ubuntu.com-20090817181818-6ks7pxgiwpqvsd3l
parent: pqm at pqm.ubuntu.com-20090817073154-p4vkx71sjlhutjl3
parent: v.ladeuil+lp at free.fr-20090817170755-f0henk23tlz5jfgf
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-08-17 19:18:18 +0100
message:
  (vila) Make selftest --parallel=fork work again
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2009-08-15 11:14:43 +0000
+++ b/bzrlib/tests/__init__.py	2009-08-17 17:04:24 +0000
@@ -2798,8 +2798,11 @@
         decorators.append(filter_tests(pattern))
     if suite_decorators:
         decorators.extend(suite_decorators)
-    # tell the result object how many tests will be running:
-    decorators.append(CountingDecorator)
+    # tell the result object how many tests will be running: (except if
+    # --parallel=fork is being used. Robert said he will provide a better
+    # progress design later -- vila 20090817)
+    if fork_decorator not in decorators:
+        decorators.append(CountingDecorator)
     for decorator in decorators:
         suite = decorator(suite)
     result = runner.run(suite)