diff options
author | akastornov <akastornov@yandex-team.ru> | 2022-02-10 16:46:03 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:46:03 +0300 |
commit | 8d3a5ed3a188a34167eaee54f1691ce5c9edf2f3 (patch) | |
tree | 1a2c5ffcf89eb53ecd79dbc9bc0a195c27404d0c /library/python/testing | |
parent | 3a2de774d91ca8d7325aaf81c200b1d2047725e6 (diff) | |
download | ydb-8d3a5ed3a188a34167eaee54f1691ce5c9edf2f3.tar.gz |
Restoring authorship annotation for <akastornov@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'library/python/testing')
3 files changed, 32 insertions, 32 deletions
diff --git a/library/python/testing/yatest_common/yatest/common/process.py b/library/python/testing/yatest_common/yatest/common/process.py index 1eccd97cde..a8bcc21f51 100644 --- a/library/python/testing/yatest_common/yatest/common/process.py +++ b/library/python/testing/yatest_common/yatest/common/process.py @@ -29,8 +29,8 @@ MAX_MESSAGE_LEN = 1500 SANITIZER_ERROR_PATTERN = br": ([A-Z][\w]+Sanitizer)" GLIBC_PATTERN = re.compile(r"\S+@GLIBC_([0-9.]+)") yatest_logger = logging.getLogger("ya.test") - - + + def truncate(s, size): if s is None: return None @@ -625,7 +625,7 @@ def wait_for(check_function, timeout, fail_message="", sleep_time=1.0, on_check_ message += ": {}".format(fail_message) raise TimeoutError(truncate(message, MAX_MESSAGE_LEN)) - + def _kill_process_tree(process_pid, target_pid_signal=None): """ Kills child processes, req. Note that psutil should be installed diff --git a/library/python/testing/yatest_common/yatest/common/runtime.py b/library/python/testing/yatest_common/yatest/common/runtime.py index 064923c9ce..e55e193446 100644 --- a/library/python/testing/yatest_common/yatest/common/runtime.py +++ b/library/python/testing/yatest_common/yatest/common/runtime.py @@ -77,15 +77,15 @@ def build_path(path=None): return _join_path(_get_ya_plugin_instance().build_root, path) -def java_path(): - """ +def java_path(): + """ [DEPRECATED] Get path to java - :return: absolute path to java - """ + :return: absolute path to java + """ from . import runtime_java - return runtime_java.get_java_path(binary_path(os.path.join('contrib', 'tools', 'jdk'))) - - + return runtime_java.get_java_path(binary_path(os.path.join('contrib', 'tools', 'jdk'))) + + def java_home(): """ Get jdk directory path diff --git a/library/python/testing/yatest_common/yatest/common/runtime_java.py b/library/python/testing/yatest_common/yatest/common/runtime_java.py index 88d27b8b79..39bbb45570 100644 --- a/library/python/testing/yatest_common/yatest/common/runtime_java.py +++ b/library/python/testing/yatest_common/yatest/common/runtime_java.py @@ -1,30 +1,30 @@ -import os -import tarfile -import contextlib - +import os +import tarfile +import contextlib + from . import runtime - + _JAVA_DIR = [] -def get_java_path(jdk_dir): +def get_java_path(jdk_dir): # deprecated - to be deleted - java_paths = (os.path.join(jdk_dir, 'bin', 'java'), os.path.join(jdk_dir, 'bin', 'java.exe')) - - for p in java_paths: - if os.path.exists(p): - return p - - for f in os.listdir(jdk_dir): - if f.endswith('.tar'): - with contextlib.closing(tarfile.open(os.path.join(jdk_dir, f))) as tf: - tf.extractall(jdk_dir) - - for p in java_paths: - if os.path.exists(p): - return p - - return '' + java_paths = (os.path.join(jdk_dir, 'bin', 'java'), os.path.join(jdk_dir, 'bin', 'java.exe')) + + for p in java_paths: + if os.path.exists(p): + return p + + for f in os.listdir(jdk_dir): + if f.endswith('.tar'): + with contextlib.closing(tarfile.open(os.path.join(jdk_dir, f))) as tf: + tf.extractall(jdk_dir) + + for p in java_paths: + if os.path.exists(p): + return p + + return '' def get_build_java_dir(jdk_dir): |