From e3f91a9f3d70dfd299fe2fc0198eaf37b1c8c37b Mon Sep 17 00:00:00 2001 From: Timofey Date: Mon, 19 Oct 2015 20:57:13 +0300 Subject: [PATCH] Start server for all tests There are some problems on linux starting and stopping the server for some reason. If we start the server before all the tests, and stop it after all the tests, we might not have those problems. --- tools/run_desktop_tests.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/run_desktop_tests.py b/tools/run_desktop_tests.py index f81ffc1836..61d052d92d 100755 --- a/tools/run_desktop_tests.py +++ b/tools/run_desktop_tests.py @@ -122,13 +122,14 @@ class TestRunner: def run_tests(self, tests_to_run): failed = [] passed = [] + self.start_server() for test_file in tests_to_run: self.log_exec_file(test_file) - if test_file in TESTS_REQUIRING_SERVER: - self.start_server() + # if test_file in TESTS_REQUIRING_SERVER: + # self.start_server() test_file_with_keys = "{test_file}{data}{resources}".format(test_file=test_file, data=self.data_path, resources=self.user_resource_path) @@ -140,8 +141,8 @@ class TestRunner: process.wait() - if test_file in TESTS_REQUIRING_SERVER: - self.stop_server() + # if test_file in TESTS_REQUIRING_SERVER: + # self.stop_server() if process.returncode > 0: failed.append(test_file) @@ -150,6 +151,7 @@ class TestRunner: self.log_exec_file(test_file, result=process.returncode) + self.stop_server() return {FAILED: failed, PASSED: passed}