Merge pull request #1277 from therearesomewhocallmetim/py-integration-parallel

Py integration parallel

tools/integration_tests_runner.py

@@ -0,0 +1,108 @@
+from __future__ import print_function
+from optparse import OptionParser
+import subprocess
+import multiprocessing
+from threading import Lock
+from threading import Thread
+import traceback
+import logging
+from os import path
+
+
+from Queue import Queue
+
+
+from run_desktop_tests import tests_on_disk
+
+__author__ = 't.danshin'
+
+
+class IntegrationRunner:
+    def __init__(self):
+        self.process_cli()
+
+        self.proc_count = multiprocessing.cpu_count()
+        logging.info("Number of processors is: {}".format(self.proc_count))
+
+        self.file_lock = Lock()
+
+        self.tests = Queue()
+
+    def run_tests(self):
+        for exec_file in self.runlist:
+            tests = self.get_tests_from_exec_file(exec_file, "--list_tests")[0]
+            for test in tests:
+                self.tests.put((exec_file, test))
+
+        self.file = open(self.output, "w")
+        self.run_parallel_tests()
+        self.file.close()
+
+
+    def run_parallel_tests(self):
+        threads = list()
+
+        for i in range(0, self.proc_count):
+            thread = Thread(target=self.exec_tests_in_queue)
+            thread.start()
+            threads.append(thread)
+
+        for thread in threads:
+            thread.join()
+
+
+    def exec_tests_in_queue(self):
+        while True:
+            try:
+                if self.tests.empty():
+                    return
+
+                test_file, test = self.tests.get()
+                self.exec_test(test_file, test)
+            except:
+                logging.error(traceback.format_exc())
+
+
+    def exec_test(self, test_file, test):
+        out, err, result = self.get_tests_from_exec_file(test_file, '--filter={test}'.format(test=test))
+        with self.file_lock:
+            self.file.write("BEGIN: {}\n".format(test_file))
+            self.file.write(str(err))
+            self.file.write("\nEND: {} | result: {}\n\n".format(test_file, result))
+            self.file.flush()
+
+
+    def get_tests_from_exec_file(self, test, keys):
+        spell = "{test} {keys}".format(test=path.join(self.workspace_path, test), keys=keys)
+
+        process = subprocess.Popen(spell.split(" "),
+                                   stdout=subprocess.PIPE,
+                                   stderr=subprocess.PIPE
+                                   )
+
+        out, err = process.communicate()
+        result = process.returncode
+
+        return filter(lambda x: x,  out.split("\n")), err, result
+
+
+    def process_cli(self):
+        parser = OptionParser()
+        parser.add_option("-o", "--output", dest="output", default="testlog.log", help="resulting log file. Default testlog.log")
+        parser.add_option("-f", "--folder", dest="folder", default="omim-build-release/out/release", help="specify the folder where the tests reside (absolute path or relative to the location of this script)")
+        parser.add_option("-i", "--include", dest="runlist", action="append", default=[], help="Include test into execution, comma separated list with no spaces or individual tests, or both. E.g.: -i one -i two -i three,four,five")
+
+        (options, args) = parser.parse_args()
+
+        if not options.runlist:
+            logging.warn("You must provide the list of tests to run. This runner doesn't run all the tests it finds, only the ones you specify.")
+            exit(2)
+
+        self.workspace_path = options.folder
+        self.runlist = filter(lambda x: x in tests_on_disk(self.workspace_path), options.runlist)
+        self.output = options.output
+
+
+if __name__ == "__main__":
+    runner = IntegrationRunner()
+    runner.run_tests()

tools/run_desktop_tests.py

@@ -97,7 +97,6 @@ class TestRunner:
         except (urllib2.URLError, socket.timeout):
             logging.info("Failed to stop the server...")
 
-
     def categorize_tests(self):
             
         tests_to_run = list()
@@ -223,5 +222,10 @@ class TestRunner:
         self.print_pretty("not found", categorized_tests[NOT_FOUND])
 
 
-runner = TestRunner()
-runner.execute()
+def tests_on_disk(path):
+    return filter(lambda x: x.endswith("_tests"), listdir(path))
+
+
+if __name__ == "__main__":
+    runner = TestRunner()
+    runner.execute()