Rev 4619: Make --parallel=fork work again. in file:///home/vila/src/bzr/bugs/selftest/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/selftest/

------------------------------------------------------------
revno: 4619
revision-id: v.ladeuil+lp at free.fr-20090817152426-8pzbe0kkn36boy2e
parent: pqm at pqm.ubuntu.com-20090817073154-p4vkx71sjlhutjl3
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: selftest
timestamp: Mon 2009-08-17 17:24:26 +0200
message:
  Make --parallel=fork work again.
  
  * bzrlib/tests/__init__.py:
  (run_suite): CoutingDecorator is incompatible with
  --parallel=fork, don't use the former when the later is
  required (even if we lose the toal number of tests that has to be
  run...).
-------------- next part --------------
=== 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 15:24:26 +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 it will provide a better
+    # progress design later -- vila 20090817)
+    if decorators[-1] is not fork_decorator:
+        decorators.append(CountingDecorator)
     for decorator in decorators:
         suite = decorator(suite)
     result = runner.run(suite)