aboutsummaryrefslogtreecommitdiffstats
path: root/testrunner.py
diff options
context:
space:
mode:
authorChristian Tismer <tismer@stackless.com>2017-03-13 10:26:24 +0100
committerChristian Tismer <tismer@stackless.com>2017-03-13 10:02:56 +0000
commit1d16081cd7d36f3e483cdefcc4f68d1e7c00ddaf (patch)
treef13cfb7c4a9e2aa580837f6c90a48d7bb9f78949 /testrunner.py
parent24266f618b1e729491ce8daddbdcf83e95bd3b41 (diff)
Fix output of testrunner.py and remove ’six’
There is a small error that reports the wrong total number of changes. Furthermore, the dependency of the six modure could be removed by a single line. Change-Id: I510eab49ae3b9c5c36a7ae31a982334fda18567d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'testrunner.py')
-rw-r--r--testrunner.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/testrunner.py b/testrunner.py
index 67ccc51a6..381f19a73 100644
--- a/testrunner.py
+++ b/testrunner.py
@@ -74,7 +74,7 @@ import subprocess
import zipfile
import argparse
-from six import PY3
+PY3 = sys.version_info[0] == 3 # from the six module
from subprocess import PIPE
if PY3:
from subprocess import TimeoutExpired
@@ -794,10 +794,10 @@ if __name__ == '__main__':
.format(*r))
print("********* Finished testing of %s *********" % project)
print()
- q = map(lambda x, y: x+y, r, q)
+ q = list(map(lambda x, y: x+y, r, q))
if len(args.projects) > 1:
- print("All above projects:", sum(r), "tests.",
+ print("All above projects:", sum(q), "tests.",
"{} passed, {} failed, {} skipped, {} blacklisted, {} bpassed."
.format(*q))
print()