diff options
author | Timofey <t.danshin@corp.mail.ru> | 2016-06-10 17:20:30 +0300 |
---|---|---|
committer | Timofey <t.danshin@corp.mail.ru> | 2016-06-10 17:20:30 +0300 |
commit | ed989ef7205f45ec4e7944d20229d619b14905b3 (patch) | |
tree | d8e30b793d7976c11441ba6da925b730273643ca /tools | |
parent | 7d295147ce55c5925875c4d17880cadb342b4cad (diff) |
Fix for some integration tests:
* Added storage integration tests to those that require temporary forlders for running normally;
* Added logging the process id for the shells running our tests (needed when a test hangs);
Diffstat (limited to 'tools')
-rw-r--r-- | tools/integration_tests_runner.py | 2 | ||||
-rwxr-xr-x | tools/run_desktop_tests.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/integration_tests_runner.py b/tools/integration_tests_runner.py index e50d99a249..0b760310f6 100644 --- a/tools/integration_tests_runner.py +++ b/tools/integration_tests_runner.py @@ -20,7 +20,7 @@ from run_desktop_tests import tests_on_disk __author__ = 't.danshin' -TEMPFOLDER_TESTS = ["search_integration_tests"] +TEMPFOLDER_TESTS = ["search_integration_tests", "storage_integration_tests"] class IntegrationRunner: diff --git a/tools/run_desktop_tests.py b/tools/run_desktop_tests.py index 565e28da2e..4c0a1e7326 100755 --- a/tools/run_desktop_tests.py +++ b/tools/run_desktop_tests.py @@ -157,6 +157,7 @@ class TestRunner: format(tests_path=self.workspace_path, test_file=test_file_with_keys, logfile=self.logfile), shell=True, stdout=subprocess.PIPE) + logging.info("Pid: {0}".format(process.pid)) process.wait() |