diff options
author | shadchin <shadchin@yandex-team.ru> | 2022-02-10 16:44:39 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:44:39 +0300 |
commit | e9656aae26e0358d5378e5b63dcac5c8dbe0e4d0 (patch) | |
tree | 64175d5cadab313b3e7039ebaa06c5bc3295e274 /library/python/testing/yatest_common/yatest | |
parent | 2598ef1d0aee359b4b6d5fdd1758916d5907d04f (diff) | |
download | ydb-e9656aae26e0358d5378e5b63dcac5c8dbe0e4d0.tar.gz |
Restoring authorship annotation for <shadchin@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'library/python/testing/yatest_common/yatest')
-rw-r--r-- | library/python/testing/yatest_common/yatest/common/process.py | 4 | ||||
-rw-r--r-- | library/python/testing/yatest_common/yatest/common/runtime.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/library/python/testing/yatest_common/yatest/common/process.py b/library/python/testing/yatest_common/yatest/common/process.py index 0c2dbb08a0..a8bcc21f51 100644 --- a/library/python/testing/yatest_common/yatest/common/process.py +++ b/library/python/testing/yatest_common/yatest/common/process.py @@ -544,8 +544,8 @@ def _get_command_output_file(cmd, ext): try: # if execution is performed from test, save out / err to the test logs dir import yatest.common - import library.python.pytest.plugins.ya - if getattr(library.python.pytest.plugins.ya, 'pytest_config', None) is None: + import library.python.pytest.plugins.ya + if getattr(library.python.pytest.plugins.ya, 'pytest_config', None) is None: raise ImportError("not in test") filename = path.get_unique_file_path(yatest.common.output_path(), filename) yatest_logger.debug("Command %s will be placed to %s", ext, os.path.basename(filename)) diff --git a/library/python/testing/yatest_common/yatest/common/runtime.py b/library/python/testing/yatest_common/yatest/common/runtime.py index e40be347df..e55e193446 100644 --- a/library/python/testing/yatest_common/yatest/common/runtime.py +++ b/library/python/testing/yatest_common/yatest/common/runtime.py @@ -12,9 +12,9 @@ _lock = threading.Lock() def _get_ya_config(): try: - import library.python.pytest.plugins.ya as ya_plugin - if ya_plugin.pytest_config is not None: - return ya_plugin.pytest_config + import library.python.pytest.plugins.ya as ya_plugin + if ya_plugin.pytest_config is not None: + return ya_plugin.pytest_config import pytest return pytest.config except (ImportError, AttributeError): |