diff options
| author | qrort <[email protected]> | 2023-06-27 01:40:25 +0300 |
|---|---|---|
| committer | qrort <[email protected]> | 2023-06-27 01:40:25 +0300 |
| commit | 97b1a695d3be4edc08550d3ae7d200f6d9f3d42e (patch) | |
| tree | 518327c6e430ba7050c3020074adb246d165120a | |
| parent | 268c3f3234d59de05f78c688e44373df8de99c6a (diff) | |
resource path to relative, pgwire path to ENV
| -rw-r--r-- | ydb/tests/functional/open_source/test_yatest_common.py | 4 | ||||
| -rw-r--r-- | ydb/tests/functional/postgresql/test_postgres.py | 3 | ||||
| -rw-r--r-- | ydb/tests/functional/postgresql/ya.make | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/ydb/tests/functional/open_source/test_yatest_common.py b/ydb/tests/functional/open_source/test_yatest_common.py index 984a5b1ad0e..d3556858a5e 100644 --- a/ydb/tests/functional/open_source/test_yatest_common.py +++ b/ydb/tests/functional/open_source/test_yatest_common.py @@ -7,7 +7,9 @@ import yatest.common as ya_common class TestYaTestContext(object): def test_source_path(self): resource_path = 'ydb/tests/functional/open_source/resource.txt' - ya_source_path = ya_common.source_path(resource_path) + arcadia_root = ya_common.source_path('') + ya_source_path = os.path.join(arcadia_root, ya_common.test_source_path('resource.txt')) + context_file = os.getenv('YA_TEST_CONTEXT_FILE') if context_file: diff --git a/ydb/tests/functional/postgresql/test_postgres.py b/ydb/tests/functional/postgresql/test_postgres.py index 52be1993e37..350a4f140ba 100644 --- a/ydb/tests/functional/postgresql/test_postgres.py +++ b/ydb/tests/functional/postgresql/test_postgres.py @@ -45,7 +45,8 @@ def psql_binary_path(): def pgwire_binary_path(): - return yatest_common.binary_path('ydb/apps/pgwire/pgwire') + assert os.getenv('PGWIRE_BINARY') + return yatest_common.binary_path(os.getenv('PGWIRE_BINARY')) def execute_binary(binary_name, cmd, wait, join_stderr=False): diff --git a/ydb/tests/functional/postgresql/ya.make b/ydb/tests/functional/postgresql/ya.make index af646ba1f39..88b4fb368b3 100644 --- a/ydb/tests/functional/postgresql/ya.make +++ b/ydb/tests/functional/postgresql/ya.make @@ -18,6 +18,8 @@ TEST_SRCS( test_postgres.py ) +ENV(PGWIRE_BINARY="ydb/apps/pgwire/pgwire") + PEERDIR( library/python/testing/yatest_common ydb/tests/library |