summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2015-09-12 20:59:31 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2015-09-14 22:52:04 +0200
commit76737593214a931dfa768708e0e5d7f9d7fa79c4 (patch)
tree3550869bcd06a5436e3d05116d277670fd141915
parent2425f6fda099a2134dbf72c8a30270cc9a659f1e (diff)
Fixed runtests.py message about parallel processes.
It didn't work anymore since the commit that enabled test parallelization by default because parallel was equal to 0 at that point.
-rwxr-xr-xtests/runtests.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/runtests.py b/tests/runtests.py
index cfc8722ae2..ea67eba51c 100755
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -104,8 +104,9 @@ def get_installed():
def setup(verbosity, test_labels, parallel):
if verbosity >= 1:
msg = "Testing against Django installed in '%s'" % os.path.dirname(django.__file__)
- if parallel > 1:
- msg += " with %d processes" % parallel
+ max_parallel = default_test_processes() if parallel == 0 else parallel
+ if max_parallel > 1:
+ msg += " with up to %d processes" % max_parallel
print(msg)
# Force declaring available_apps in TransactionTestCase for faster tests.