Changes in python test runners to master

9 files changed, 244 insertions, 168 deletions

diff --git a/tools/integration_tests_runner.py b/tools/integration_tests_runner.py
deleted file mode 100644
index 0b760310f6..0000000000
--- a/tools/integration_tests_runner.py
+++ /dev/null
@@ -1,167 +0,0 @@
-from __future__ import print_function
-
-import logging
-import multiprocessing
-from optparse import OptionParser
-from os import path
-from Queue import Queue
-from random import shuffle
-import shutil
-import subprocess
-import tempfile
-from threading import Lock
-from threading import Thread
-from time import time
-import traceback
-
-
-from run_desktop_tests import tests_on_disk
-
-__author__ = 't.danshin'
-
-
-TEMPFOLDER_TESTS = ["search_integration_tests", "storage_integration_tests"]
-
-
-class IntegrationRunner:
-    def __init__(self):
-        self.process_cli()
-
-        self.proc_count = multiprocessing.cpu_count()
-        logging.info("Number of processors is: {nproc}".format(nproc=self.proc_count))
-
-        self.file_lock = Lock()
-        self.start_finish_lock = Lock()
-        self.tests = Queue()
-        self.key_postfix = ""
-        if self.user_resource_path:
-            self.key_postfix += ' --user_resource_path="{0}"'.format(self.user_resource_path)
-        if self.data_path:
-            self.key_postfix += ' --data_path="{0}"'.format(self.data_path)
-
-
-    def run_tests(self):
-        intermediate_tests = []
-        for exec_file in self.runlist:
-            intermediate_tests.extend(map(lambda x: (exec_file, x), self.get_tests_from_exec_file(exec_file, "--list_tests")[0]))
-
-        shuffle(intermediate_tests)
-        for test in intermediate_tests:
-            self.tests.put(test)
-
-        with open(self.output, "w") as self.file, open("start-finish.log", "w") as self.start_finish_log:
-            self.run_parallel_tests()
-
-
-    def run_parallel_tests(self):
-        threads = []
-
-        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 not self.tests.empty():
-            try:
-                test_file, test = self.tests.get()
-                self.exec_test(test_file, test, clean_env=(test_file in TEMPFOLDER_TESTS))
-
-            except:
-                logging.error(traceback.format_exc())
-                return
-
-
-    def log_start_finish(self, test_file, keys, start=False, finish=False):
-        if not self.write_start_finish_log:
-            return
-
-        if (not start and not finish) or (start and finish):
-            logging.warning("You need to pass either start=True or finish=True, but only one of them! You passed start={0}, finish={1}".format(start, finish))
-            return
-
-        string = "Started" if start else "Finished"
-
-        with self.start_finish_lock:
-            self.start_finish_log.write("{string} {test_file} {keys} at {time}\n".format(string=string, test_file=test_file, keys=keys, time=time()))
-            self.start_finish_log.flush()
-
-
-    def exec_test(self, test_file, test, clean_env=False):
-        keys = '"--filter={test}"'.format(test=test)
-        if clean_env:
-            tmpdir = tempfile.mkdtemp()
-            keys = '{old_key} "--data_path={tmpdir}"'.format(old_key=keys, tmpdir=tmpdir)
-            logging.debug("Temp dir: {tmpdir}".format(tmpdir=tmpdir))
-        else:
-            keys = "{old_key}{resource_path}".format(old_key=keys, resource_path=self.key_postfix)
-            logging.debug("Setting user_resource_path and data_path to {resource_path}".format(resource_path=self.key_postfix))
-
-        self.log_start_finish(test_file, keys, start=True)
-        out, err, result = self.get_tests_from_exec_file(test_file, keys)
-        self.log_start_finish(test_file, keys, finish=True)
-
-        if clean_env:
-            try:
-                shutil.rmtree(tmpdir)
-            except:
-                logging.error("Failed to remove tempdir {tmpdir}".format(tmpdir=tmpdir))
-
-        with self.file_lock:
-            self.file.write("BEGIN: {file}\n".format(file=test_file))
-            self.file.write(str(err))
-            self.file.write("\nEND: {file} | result: {res}\n\n".format(file=test_file, res=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)]
-        logging.debug(">> {spell}".format(spell=spell))
-
-        process = subprocess.Popen(spell,
-                                   stdout=subprocess.PIPE,
-                                   stderr=subprocess.PIPE,
-                                   shell=True
-                                   )
-
-        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")
-        parser.add_option("-r", "--user_resource_path", dest="user_resource_path", default="", help="Path to user resources, such as MWMs")
-        parser.add_option("-d", "--data_path", dest="data_path", default="", help="Path to the writable dir")
-        parser.add_option("-l", "--log_start_finish", dest="log_start_finish", action="store_true", default=False,
-                          help="Write to log each time a test starts or finishes. May be useful if you need to find out which of the tests runs for how long, and which test hang. May slow down the execution of tests.")
-
-        (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
-        interim_runlist = list()
-        for opt in options.runlist:
-            interim_runlist.extend(map(lambda x: x.strip(), opt.split(",")))
-
-        self.runlist = filter(lambda x: x in tests_on_disk(self.workspace_path), interim_runlist)
-        self.output = options.output
-        self.user_resource_path = options.user_resource_path
-        self.data_path = options.data_path
-        self.write_start_finish_log = options.log_start_finish
-
-
-if __name__ == "__main__":
-    runner = IntegrationRunner()
-    runner.run_tests()
diff --git a/tools/ResponseProvider.py b/tools/python/ResponseProvider.py
index 2a3b26e43e..2a3b26e43e 100644
--- a/tools/ResponseProvider.py
+++ b/tools/python/ResponseProvider.py
diff --git a/tools/SiblingKiller.py b/tools/python/SiblingKiller.py
index aaa775413f..aaa775413f 100644
--- a/tools/SiblingKiller.py
+++ b/tools/python/SiblingKiller.py
diff --git a/tools/python/Util.py b/tools/python/Util.py
new file mode 100644
index 0000000000..7d6a17984a
--- /dev/null
+++ b/tools/python/Util.py
@@ -0,0 +1,14 @@
+from contextlib import contextmanager
+import shutil
+import tempfile
+
+try:
+    from tempfile import TemporaryDirectory
+except ImportError:
+    @contextmanager
+    def TemporaryDirectory():
+        name = tempfile.mkdtemp()
+        try:
+            yield name
+        finally:
+            shutil.rmtree(name)
diff --git a/tools/python/integration_tests_runner.py b/tools/python/integration_tests_runner.py
new file mode 100644
index 0000000000..fdaa31ff03
--- /dev/null
+++ b/tools/python/integration_tests_runner.py
@@ -0,0 +1,230 @@
+from __future__ import print_function
+
+import logging
+from multiprocessing import cpu_count
+import multiprocessing
+from argparse import ArgumentParser
+from os import path
+import subprocess
+from warnings import warn
+
+from run_desktop_tests import tests_on_disk
+from Util import TemporaryDirectory
+
+__author__ = 't.danshin'
+
+TEST_RESULT_LOG = "test_result_log"
+TEMPFOLDER_TESTS = ["search_integration_tests", "storage_integration_tests"]
+
+FILTER_KEY = "--filter"
+DATA_PATH_KEY = "--data_path"
+RESOURCE_PATH_KEY = "--user_resource_path"
+
+
+def setup_test_result_log(log_file, level=logging.INFO):
+    logger = logging.getLogger(TEST_RESULT_LOG)
+    formatter = logging.Formatter("BEGIN: %(file)s\n%(message)s\nEND: %(file)s | result: %(result)d\n")
+    file_handler = logging.FileHandler(log_file, mode='w')
+    file_handler.setFormatter(formatter)
+    logger.setLevel(level)
+    logger.propagate = False
+    logger.addHandler(file_handler)
+
+
+def setup_jenkins_console_logger(level=logging.INFO):
+    formatter = logging.Formatter('%(process)s: %(msg)s')
+    # Time is logged by Jenkins. Any log files on disk will be removed by
+    # Jenkins when the next job starts
+    stream_handler = logging.StreamHandler()
+    stream_handler.setFormatter(formatter)
+    multiprocessing.get_logger().setLevel(level)
+    multiprocessing.get_logger().addHandler(stream_handler)
+
+
+def with_logging(fn):
+    def func_wrapper(test, flags):
+        logger = multiprocessing.get_logger()
+        logger.info("start: >{0} {1}".format(test, flags))
+        result = fn(test, flags)
+        logger.info("end: >{0} {1}".format(test, flags))
+        return result
+
+    return func_wrapper
+
+
+@with_logging
+def spawn_test_process(test, flags):
+    spell = ["{0} {1}".format(test, flags)]
+
+    process = subprocess.Popen(spell,
+                               stdout=subprocess.PIPE,
+                               stderr=subprocess.PIPE,
+                               shell=True
+                               )
+
+    multiprocessing.get_logger().info(spell[0])
+    out, err = process.communicate()
+
+    return filter(None, out.splitlines()), err, process.returncode
+
+
+def exec_test(a_tuple):
+    """
+    Executes a test and returns the result
+    :param a_tuple: a tuple consisting of
+    * the path to the test file (e.g. ..../base_tests)
+    * the name of the test to be executed from that file
+    * dictionary with all the parameters to be passed to the executable. At
+    this point the flags may contain --user_resource_path and --data_path if the
+    executable file is not in the list of the tests that require temporary folders
+
+    :return: (the name of the file, the name of the test),
+    (standard error from the test, test's exit code)
+    """
+    test_file, test_name, params = a_tuple
+    params[FILTER_KEY] = test_name
+
+    if path.basename(test_file) in TEMPFOLDER_TESTS:
+        return exec_test_with_temp(test_file, params)
+
+    return exec_test_without_temp(test_file, params)
+
+
+def exec_test_with_temp(test_file, params):
+    with TemporaryDirectory() as tmpdir:
+        params[DATA_PATH_KEY] = tmpdir
+        return exec_test_without_temp(test_file, params)
+
+
+def exec_test_without_temp(test_file, params):
+    flags = params_from_dict(params)
+    return spawn_test_process(test_file, flags)
+
+
+def params_from_dict(params_dict):
+    return " ".join(
+        '"{0}={1}"'.format(key, value)
+        for key, value in params_dict.iteritems()
+        if value != ""
+    )
+
+
+class IntegrationRunner:
+    def __init__(self):
+        proc_count = cpu_count() / 5 * 4
+        if proc_count < 1:
+            proc_count = 1
+        self.pool = multiprocessing.Pool(proc_count, initializer=setup_jenkins_console_logger)
+        self.workspace_path = ""
+        self.runlist = []
+        self.params = {}
+        self.process_cli()
+        multiprocessing.get_logger().info(
+            "\n{0}\nIntegration tests runner started.\n{0}\n".format(
+                "*" * 80
+            )
+        )
+
+
+    def run_tests(self):
+        logger = logging.getLogger(TEST_RESULT_LOG)
+        try:
+            test_results = self.pool.imap_unordered(
+                exec_test,
+                self.prepare_list_of_tests()
+            )
+            for test_file, err, result in test_results:
+                logger.info(
+                    err,
+                    extra={"file" : path.basename(test_file), "result" : result}
+                )
+
+        finally:
+            self.pool.close()
+            self.pool.join()
+
+
+    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
+
+        return map(
+            lambda tests_in_file: (test_full_path, tests_in_file, self.params),
+            tests
+        )
+
+
+    def prepare_list_of_tests(self):
+        for exec_file in self.runlist:
+            for test_tuple in self.map_args(exec_file):
+                yield test_tuple
+
+
+    def set_instance_vars_from_options(self, args):
+        self.workspace_path = args.folder
+        for opt in args.runlist:
+            self.runlist.extend(map(str.strip, opt.split(",")))
+
+        tests_on_disk_list = tests_on_disk(self.workspace_path)
+        self.runlist = filter(lambda x: x in tests_on_disk_list, self.runlist)
+
+        self.params[RESOURCE_PATH_KEY] = args.user_resource_path
+        self.params[DATA_PATH_KEY] = args.data_path
+
+
+    def process_cli(self):
+        parser = self.prepare_cli_parser()
+        args = parser.parse_args()
+
+        self.set_instance_vars_from_options(args)
+
+        setup_test_result_log(args.output)
+        setup_jenkins_console_logger()
+
+        if args.log_start_finish:
+            warn(
+                "The -l option is now deprecated. Please, remove it from your build scripts. It may be removed at any time.",
+                 DeprecationWarning
+            )
+
+
+    def prepare_cli_parser(self):
+        parser = ArgumentParser()
+        parser.add_argument(
+            "-o", "--output",
+            dest="output", default="testlog.log",
+            help="resulting log file. Default testlog.log"
+        )
+        parser.add_argument(
+            "-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_argument(
+            "-i", "--include",
+            required=True,
+            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"
+        )
+        parser.add_argument(
+            "-r", "--user_resource_path",
+            dest="user_resource_path", default="",
+            help="Path to user resources, such as MWMs"
+        )
+        parser.add_argument(
+            "-d", "--data_path",
+            dest="data_path", default="",
+            help="Path to the writable dir"
+        )
+        parser.add_argument(
+            "-l", "--log_start_finish",
+            dest="log_start_finish", action="store_true", default=False,
+            help="DEPRECATED. Write to log each time a test starts or finishes. May be useful if you need to find out which of the tests runs for how long, and which test hang. May slow down the execution of tests."
+        )
+        return parser
+
+
+if __name__ == "__main__":
+    runner = IntegrationRunner()
+    runner.run_tests()
+    multiprocessing.get_logger().info("Done")
diff --git a/tools/run_desktop_tests.py b/tools/python/run_desktop_tests.py
index 4c0a1e7326..4c0a1e7326 100755..100644
--- a/tools/run_desktop_tests.py
+++ b/tools/python/run_desktop_tests.py
diff --git a/tools/testlog_to_xml_converter.py b/tools/python/testlog_to_xml_converter.py
index 5c15bb99f2..5c15bb99f2 100755..100644
--- a/tools/testlog_to_xml_converter.py
+++ b/tools/python/testlog_to_xml_converter.py
diff --git a/tools/testserver.py b/tools/python/testserver.py
index 34736ffbf1..1efedc1c1b 100644
--- a/tools/testserver.py
+++ b/tools/python/testserver.py
@@ -36,7 +36,6 @@ from ResponseProvider import ResponseProvider
 from ResponseProvider import ResponseProviderMixin
 from SiblingKiller import SiblingKiller
 from threading import Timer
-import BaseHTTPServer
 import os
 import socket
 import threading
diff --git a/tools/tornado_handler.py b/tools/python/tornado_handler.py
index 017bf4fc6a..017bf4fc6a 100644
--- a/tools/tornado_handler.py
+++ b/tools/python/tornado_handler.py