Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorTimofey <t.danshin@corp.mail.ru>2016-06-23 12:54:53 +0300
committerVladimir Byko-Ianko <v.bykoianko@corp.mail.ru>2016-06-24 16:02:13 +0300
commit7a6f80b03a4d86130354ec2aff70c1f6ad98b44e (patch)
treeae3bf5341c39d6a20a998df1d998f49b68b6732b /tools
parent0bd24ddcdb2c00452c2a528ebe7e430796f31a96 (diff)
Fixed the script again.
Diffstat (limited to 'tools')
-rw-r--r--tools/python/integration_tests_runner.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/python/integration_tests_runner.py b/tools/python/integration_tests_runner.py
index fdaa31ff03..4a2eb41bd8 100644
--- a/tools/python/integration_tests_runner.py
+++ b/tools/python/integration_tests_runner.py
@@ -65,7 +65,9 @@ def spawn_test_process(test, flags):
multiprocessing.get_logger().info(spell[0])
out, err = process.communicate()
- return filter(None, out.splitlines()), err, process.returncode
+ #We need the out for getting the list of tests from an exec file
+ # by sending it the --list_tests flag
+ return test, filter(None, out.splitlines()), err, process.returncode
def exec_test(a_tuple):
@@ -133,7 +135,7 @@ class IntegrationRunner:
exec_test,
self.prepare_list_of_tests()
)
- for test_file, err, result in test_results:
+ for test_file, _, err, result in test_results:
logger.info(
err,
extra={"file" : path.basename(test_file), "result" : result}
@@ -146,7 +148,7 @@ class IntegrationRunner:
def map_args(self, test):
test_full_path = path.join(self.workspace_path, test)
- tests = spawn_test_process(test_full_path, "--list_tests")[0] # a list
+ tests = spawn_test_process(test_full_path, "--list_tests")[1] # a list
return map(
lambda tests_in_file: (test_full_path, tests_in_file, self.params),