Fixed the script again.

3 files changed, 6 insertions, 5 deletions

diff --git a/tools/python/integration_tests_runner.py b/tools/python/integration_tests_runner.py
index 79a7fac686..fd80c35f55 100644
--- a/tools/python/integration_tests_runner.py
+++ b/tools/python/integration_tests_runner.py
@@ -63,9 +63,10 @@ def spawn_test_process(test, flags):
                                )
 
     multiprocessing.get_logger().info(spell[0])
-    _, err = process.communicate()
-
-    return test, err, process.returncode
+    out, err = process.communicate()
+    #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 +134,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 +147,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),
diff --git a/tools/python/run_desktop_tests.py b/tools/python/run_desktop_tests.py
index 4c0a1e7326..4c0a1e7326 100644..100755
--- a/tools/python/run_desktop_tests.py
+++ b/tools/python/run_desktop_tests.py
diff --git a/tools/python/testlog_to_xml_converter.py b/tools/python/testlog_to_xml_converter.py
index 5c15bb99f2..5c15bb99f2 100644..100755
--- a/tools/python/testlog_to_xml_converter.py
+++ b/tools/python/testlog_to_xml_converter.py