From f1777a650fbc31d52233b18683a29136fac94ffc Mon Sep 17 00:00:00 2001 From: Vitaly Stoyan Date: Thu, 2 Jan 2025 13:50:46 +0300 Subject: [PATCH 1/2] init --- ydb/tests/fq/yt/kqp_yt_file.make | 2 +- ydb/tests/fq/yt/kqp_yt_file.py | 12 ++++++++---- ydb/tests/fq/yt/kqp_yt_file/part0/test.py | 4 ++-- ydb/tests/fq/yt/kqp_yt_file/part1/test.py | 4 ++-- ydb/tests/fq/yt/kqp_yt_file/part10/test.py | 4 ++-- ydb/tests/fq/yt/kqp_yt_file/part11/test.py | 4 ++-- ydb/tests/fq/yt/kqp_yt_file/part12/test.py | 14 -------------- ydb/tests/fq/yt/kqp_yt_file/part13/test.py | 4 ++-- ydb/tests/fq/yt/kqp_yt_file/part14/test.py | 4 ++-- ydb/tests/fq/yt/kqp_yt_file/part15/test.py | 4 ++-- ydb/tests/fq/yt/kqp_yt_file/part16/test.py | 4 ++-- ydb/tests/fq/yt/kqp_yt_file/part17/test.py | 4 ++-- ydb/tests/fq/yt/kqp_yt_file/part18/test.py | 4 ++-- ydb/tests/fq/yt/kqp_yt_file/part19/test.py | 4 ++-- ydb/tests/fq/yt/kqp_yt_file/part2/test.py | 4 ++-- ydb/tests/fq/yt/kqp_yt_file/part3/test.py | 4 ++-- ydb/tests/fq/yt/kqp_yt_file/part4/test.py | 4 ++-- ydb/tests/fq/yt/kqp_yt_file/part5/test.py | 4 ++-- ydb/tests/fq/yt/kqp_yt_file/part6/test.py | 4 ++-- ydb/tests/fq/yt/kqp_yt_file/part7/test.py | 4 ++-- ydb/tests/fq/yt/kqp_yt_file/part8/test.py | 4 ++-- ydb/tests/fq/yt/kqp_yt_file/part9/test.py | 4 ++-- 22 files changed, 47 insertions(+), 57 deletions(-) diff --git a/ydb/tests/fq/yt/kqp_yt_file.make b/ydb/tests/fq/yt/kqp_yt_file.make index 898d2fd04595..21a58f78ba15 100644 --- a/ydb/tests/fq/yt/kqp_yt_file.make +++ b/ydb/tests/fq/yt/kqp_yt_file.make @@ -23,7 +23,7 @@ DEPENDS( DATA( arcadia/ydb/library/yql/tests/sql - arcadia/yql/essentials/tests/sql/suites + arcadia/yt/yql/tests/sql/suites arcadia/ydb/tests/fq/yt arcadia/ydb/tests/fq/yt/cfg ) diff --git a/ydb/tests/fq/yt/kqp_yt_file.py b/ydb/tests/fq/yt/kqp_yt_file.py index b67e67742f22..e6951b0b27c9 100644 --- a/ydb/tests/fq/yt/kqp_yt_file.py +++ b/ydb/tests/fq/yt/kqp_yt_file.py @@ -2,11 +2,15 @@ import pytest +import yatest.common from test_file_common import check_provider, get_sql_query from kqprun import KqpRun -from test_utils import DATA_PATH, get_config, get_parameters_files, replace_vars +from test_utils import get_config, get_parameters_files, replace_vars from yql_utils import KSV_ATTR, get_files, get_http_files, get_tables, is_xfail, yql_binary_path, yql_source_path + +DATA_PATH = yatest.common.source_path('yt/yql/tests/sql/suites') + EXCLUDED_SUITES = [ ] @@ -181,16 +185,16 @@ def run_test(suite, case, cfg): def run_file_kqp_no_cache(suite, case, cfg): - config = get_config(suite, case, cfg) + config = get_config(suite, case, cfg, data_path=DATA_PATH) in_tables = get_tables(suite, config, DATA_PATH, def_attr=KSV_ATTR)[0] - sql_query = get_sql_query('yt', suite, case, config) + sql_query = get_sql_query('yt', suite, case, config, data_path=DATA_PATH) sql_query = replace_vars(sql_query, "yqlrun_var") check_provider('yt', config) validate_sql(sql_query) - if get_parameters_files(suite, config): + if get_parameters_files(suite, config, data_path=DATA_PATH): pytest.skip('params is not supported in KqpRun') if get_files(suite, config, DATA_PATH) or get_http_files(suite, config, DATA_PATH): diff --git a/ydb/tests/fq/yt/kqp_yt_file/part0/test.py b/ydb/tests/fq/yt/kqp_yt_file/part0/test.py index a1662b01cf4e..e154b15b3319 100644 --- a/ydb/tests/fq/yt/kqp_yt_file/part0/test.py +++ b/ydb/tests/fq/yt/kqp_yt_file/part0/test.py @@ -1,13 +1,13 @@ import yatest -from kqp_yt_file import run_test +from kqp_yt_file import run_test, DATA_PATH from test_utils import pytest_generate_tests_for_part from yql_utils import pytest_get_current_part def pytest_generate_tests(metafunc): current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__)) - return pytest_generate_tests_for_part(metafunc, current_part, part_count) + return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH) def test(suite, case, cfg): diff --git a/ydb/tests/fq/yt/kqp_yt_file/part1/test.py b/ydb/tests/fq/yt/kqp_yt_file/part1/test.py index a1662b01cf4e..e154b15b3319 100644 --- a/ydb/tests/fq/yt/kqp_yt_file/part1/test.py +++ b/ydb/tests/fq/yt/kqp_yt_file/part1/test.py @@ -1,13 +1,13 @@ import yatest -from kqp_yt_file import run_test +from kqp_yt_file import run_test, DATA_PATH from test_utils import pytest_generate_tests_for_part from yql_utils import pytest_get_current_part def pytest_generate_tests(metafunc): current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__)) - return pytest_generate_tests_for_part(metafunc, current_part, part_count) + return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH) def test(suite, case, cfg): diff --git a/ydb/tests/fq/yt/kqp_yt_file/part10/test.py b/ydb/tests/fq/yt/kqp_yt_file/part10/test.py index a1662b01cf4e..e154b15b3319 100644 --- a/ydb/tests/fq/yt/kqp_yt_file/part10/test.py +++ b/ydb/tests/fq/yt/kqp_yt_file/part10/test.py @@ -1,13 +1,13 @@ import yatest -from kqp_yt_file import run_test +from kqp_yt_file import run_test, DATA_PATH from test_utils import pytest_generate_tests_for_part from yql_utils import pytest_get_current_part def pytest_generate_tests(metafunc): current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__)) - return pytest_generate_tests_for_part(metafunc, current_part, part_count) + return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH) def test(suite, case, cfg): diff --git a/ydb/tests/fq/yt/kqp_yt_file/part11/test.py b/ydb/tests/fq/yt/kqp_yt_file/part11/test.py index a1662b01cf4e..e154b15b3319 100644 --- a/ydb/tests/fq/yt/kqp_yt_file/part11/test.py +++ b/ydb/tests/fq/yt/kqp_yt_file/part11/test.py @@ -1,13 +1,13 @@ import yatest -from kqp_yt_file import run_test +from kqp_yt_file import run_test, DATA_PATH from test_utils import pytest_generate_tests_for_part from yql_utils import pytest_get_current_part def pytest_generate_tests(metafunc): current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__)) - return pytest_generate_tests_for_part(metafunc, current_part, part_count) + return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH) def test(suite, case, cfg): diff --git a/ydb/tests/fq/yt/kqp_yt_file/part12/test.py b/ydb/tests/fq/yt/kqp_yt_file/part12/test.py index a1662b01cf4e..e69de29bb2d1 100644 --- a/ydb/tests/fq/yt/kqp_yt_file/part12/test.py +++ b/ydb/tests/fq/yt/kqp_yt_file/part12/test.py @@ -1,14 +0,0 @@ -import yatest - -from kqp_yt_file import run_test -from test_utils import pytest_generate_tests_for_part -from yql_utils import pytest_get_current_part - - -def pytest_generate_tests(metafunc): - current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__)) - return pytest_generate_tests_for_part(metafunc, current_part, part_count) - - -def test(suite, case, cfg): - return run_test(suite, case, cfg) diff --git a/ydb/tests/fq/yt/kqp_yt_file/part13/test.py b/ydb/tests/fq/yt/kqp_yt_file/part13/test.py index a1662b01cf4e..e154b15b3319 100644 --- a/ydb/tests/fq/yt/kqp_yt_file/part13/test.py +++ b/ydb/tests/fq/yt/kqp_yt_file/part13/test.py @@ -1,13 +1,13 @@ import yatest -from kqp_yt_file import run_test +from kqp_yt_file import run_test, DATA_PATH from test_utils import pytest_generate_tests_for_part from yql_utils import pytest_get_current_part def pytest_generate_tests(metafunc): current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__)) - return pytest_generate_tests_for_part(metafunc, current_part, part_count) + return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH) def test(suite, case, cfg): diff --git a/ydb/tests/fq/yt/kqp_yt_file/part14/test.py b/ydb/tests/fq/yt/kqp_yt_file/part14/test.py index a1662b01cf4e..e154b15b3319 100644 --- a/ydb/tests/fq/yt/kqp_yt_file/part14/test.py +++ b/ydb/tests/fq/yt/kqp_yt_file/part14/test.py @@ -1,13 +1,13 @@ import yatest -from kqp_yt_file import run_test +from kqp_yt_file import run_test, DATA_PATH from test_utils import pytest_generate_tests_for_part from yql_utils import pytest_get_current_part def pytest_generate_tests(metafunc): current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__)) - return pytest_generate_tests_for_part(metafunc, current_part, part_count) + return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH) def test(suite, case, cfg): diff --git a/ydb/tests/fq/yt/kqp_yt_file/part15/test.py b/ydb/tests/fq/yt/kqp_yt_file/part15/test.py index a1662b01cf4e..e154b15b3319 100644 --- a/ydb/tests/fq/yt/kqp_yt_file/part15/test.py +++ b/ydb/tests/fq/yt/kqp_yt_file/part15/test.py @@ -1,13 +1,13 @@ import yatest -from kqp_yt_file import run_test +from kqp_yt_file import run_test, DATA_PATH from test_utils import pytest_generate_tests_for_part from yql_utils import pytest_get_current_part def pytest_generate_tests(metafunc): current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__)) - return pytest_generate_tests_for_part(metafunc, current_part, part_count) + return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH) def test(suite, case, cfg): diff --git a/ydb/tests/fq/yt/kqp_yt_file/part16/test.py b/ydb/tests/fq/yt/kqp_yt_file/part16/test.py index a1662b01cf4e..e154b15b3319 100644 --- a/ydb/tests/fq/yt/kqp_yt_file/part16/test.py +++ b/ydb/tests/fq/yt/kqp_yt_file/part16/test.py @@ -1,13 +1,13 @@ import yatest -from kqp_yt_file import run_test +from kqp_yt_file import run_test, DATA_PATH from test_utils import pytest_generate_tests_for_part from yql_utils import pytest_get_current_part def pytest_generate_tests(metafunc): current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__)) - return pytest_generate_tests_for_part(metafunc, current_part, part_count) + return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH) def test(suite, case, cfg): diff --git a/ydb/tests/fq/yt/kqp_yt_file/part17/test.py b/ydb/tests/fq/yt/kqp_yt_file/part17/test.py index a1662b01cf4e..e154b15b3319 100644 --- a/ydb/tests/fq/yt/kqp_yt_file/part17/test.py +++ b/ydb/tests/fq/yt/kqp_yt_file/part17/test.py @@ -1,13 +1,13 @@ import yatest -from kqp_yt_file import run_test +from kqp_yt_file import run_test, DATA_PATH from test_utils import pytest_generate_tests_for_part from yql_utils import pytest_get_current_part def pytest_generate_tests(metafunc): current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__)) - return pytest_generate_tests_for_part(metafunc, current_part, part_count) + return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH) def test(suite, case, cfg): diff --git a/ydb/tests/fq/yt/kqp_yt_file/part18/test.py b/ydb/tests/fq/yt/kqp_yt_file/part18/test.py index a1662b01cf4e..e154b15b3319 100644 --- a/ydb/tests/fq/yt/kqp_yt_file/part18/test.py +++ b/ydb/tests/fq/yt/kqp_yt_file/part18/test.py @@ -1,13 +1,13 @@ import yatest -from kqp_yt_file import run_test +from kqp_yt_file import run_test, DATA_PATH from test_utils import pytest_generate_tests_for_part from yql_utils import pytest_get_current_part def pytest_generate_tests(metafunc): current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__)) - return pytest_generate_tests_for_part(metafunc, current_part, part_count) + return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH) def test(suite, case, cfg): diff --git a/ydb/tests/fq/yt/kqp_yt_file/part19/test.py b/ydb/tests/fq/yt/kqp_yt_file/part19/test.py index a1662b01cf4e..e154b15b3319 100644 --- a/ydb/tests/fq/yt/kqp_yt_file/part19/test.py +++ b/ydb/tests/fq/yt/kqp_yt_file/part19/test.py @@ -1,13 +1,13 @@ import yatest -from kqp_yt_file import run_test +from kqp_yt_file import run_test, DATA_PATH from test_utils import pytest_generate_tests_for_part from yql_utils import pytest_get_current_part def pytest_generate_tests(metafunc): current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__)) - return pytest_generate_tests_for_part(metafunc, current_part, part_count) + return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH) def test(suite, case, cfg): diff --git a/ydb/tests/fq/yt/kqp_yt_file/part2/test.py b/ydb/tests/fq/yt/kqp_yt_file/part2/test.py index a1662b01cf4e..e154b15b3319 100644 --- a/ydb/tests/fq/yt/kqp_yt_file/part2/test.py +++ b/ydb/tests/fq/yt/kqp_yt_file/part2/test.py @@ -1,13 +1,13 @@ import yatest -from kqp_yt_file import run_test +from kqp_yt_file import run_test, DATA_PATH from test_utils import pytest_generate_tests_for_part from yql_utils import pytest_get_current_part def pytest_generate_tests(metafunc): current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__)) - return pytest_generate_tests_for_part(metafunc, current_part, part_count) + return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH) def test(suite, case, cfg): diff --git a/ydb/tests/fq/yt/kqp_yt_file/part3/test.py b/ydb/tests/fq/yt/kqp_yt_file/part3/test.py index a1662b01cf4e..e154b15b3319 100644 --- a/ydb/tests/fq/yt/kqp_yt_file/part3/test.py +++ b/ydb/tests/fq/yt/kqp_yt_file/part3/test.py @@ -1,13 +1,13 @@ import yatest -from kqp_yt_file import run_test +from kqp_yt_file import run_test, DATA_PATH from test_utils import pytest_generate_tests_for_part from yql_utils import pytest_get_current_part def pytest_generate_tests(metafunc): current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__)) - return pytest_generate_tests_for_part(metafunc, current_part, part_count) + return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH) def test(suite, case, cfg): diff --git a/ydb/tests/fq/yt/kqp_yt_file/part4/test.py b/ydb/tests/fq/yt/kqp_yt_file/part4/test.py index a1662b01cf4e..e154b15b3319 100644 --- a/ydb/tests/fq/yt/kqp_yt_file/part4/test.py +++ b/ydb/tests/fq/yt/kqp_yt_file/part4/test.py @@ -1,13 +1,13 @@ import yatest -from kqp_yt_file import run_test +from kqp_yt_file import run_test, DATA_PATH from test_utils import pytest_generate_tests_for_part from yql_utils import pytest_get_current_part def pytest_generate_tests(metafunc): current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__)) - return pytest_generate_tests_for_part(metafunc, current_part, part_count) + return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH) def test(suite, case, cfg): diff --git a/ydb/tests/fq/yt/kqp_yt_file/part5/test.py b/ydb/tests/fq/yt/kqp_yt_file/part5/test.py index a1662b01cf4e..e154b15b3319 100644 --- a/ydb/tests/fq/yt/kqp_yt_file/part5/test.py +++ b/ydb/tests/fq/yt/kqp_yt_file/part5/test.py @@ -1,13 +1,13 @@ import yatest -from kqp_yt_file import run_test +from kqp_yt_file import run_test, DATA_PATH from test_utils import pytest_generate_tests_for_part from yql_utils import pytest_get_current_part def pytest_generate_tests(metafunc): current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__)) - return pytest_generate_tests_for_part(metafunc, current_part, part_count) + return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH) def test(suite, case, cfg): diff --git a/ydb/tests/fq/yt/kqp_yt_file/part6/test.py b/ydb/tests/fq/yt/kqp_yt_file/part6/test.py index a1662b01cf4e..e154b15b3319 100644 --- a/ydb/tests/fq/yt/kqp_yt_file/part6/test.py +++ b/ydb/tests/fq/yt/kqp_yt_file/part6/test.py @@ -1,13 +1,13 @@ import yatest -from kqp_yt_file import run_test +from kqp_yt_file import run_test, DATA_PATH from test_utils import pytest_generate_tests_for_part from yql_utils import pytest_get_current_part def pytest_generate_tests(metafunc): current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__)) - return pytest_generate_tests_for_part(metafunc, current_part, part_count) + return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH) def test(suite, case, cfg): diff --git a/ydb/tests/fq/yt/kqp_yt_file/part7/test.py b/ydb/tests/fq/yt/kqp_yt_file/part7/test.py index a1662b01cf4e..e154b15b3319 100644 --- a/ydb/tests/fq/yt/kqp_yt_file/part7/test.py +++ b/ydb/tests/fq/yt/kqp_yt_file/part7/test.py @@ -1,13 +1,13 @@ import yatest -from kqp_yt_file import run_test +from kqp_yt_file import run_test, DATA_PATH from test_utils import pytest_generate_tests_for_part from yql_utils import pytest_get_current_part def pytest_generate_tests(metafunc): current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__)) - return pytest_generate_tests_for_part(metafunc, current_part, part_count) + return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH) def test(suite, case, cfg): diff --git a/ydb/tests/fq/yt/kqp_yt_file/part8/test.py b/ydb/tests/fq/yt/kqp_yt_file/part8/test.py index a1662b01cf4e..e154b15b3319 100644 --- a/ydb/tests/fq/yt/kqp_yt_file/part8/test.py +++ b/ydb/tests/fq/yt/kqp_yt_file/part8/test.py @@ -1,13 +1,13 @@ import yatest -from kqp_yt_file import run_test +from kqp_yt_file import run_test, DATA_PATH from test_utils import pytest_generate_tests_for_part from yql_utils import pytest_get_current_part def pytest_generate_tests(metafunc): current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__)) - return pytest_generate_tests_for_part(metafunc, current_part, part_count) + return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH) def test(suite, case, cfg): diff --git a/ydb/tests/fq/yt/kqp_yt_file/part9/test.py b/ydb/tests/fq/yt/kqp_yt_file/part9/test.py index a1662b01cf4e..e154b15b3319 100644 --- a/ydb/tests/fq/yt/kqp_yt_file/part9/test.py +++ b/ydb/tests/fq/yt/kqp_yt_file/part9/test.py @@ -1,13 +1,13 @@ import yatest -from kqp_yt_file import run_test +from kqp_yt_file import run_test, DATA_PATH from test_utils import pytest_generate_tests_for_part from yql_utils import pytest_get_current_part def pytest_generate_tests(metafunc): current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__)) - return pytest_generate_tests_for_part(metafunc, current_part, part_count) + return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH) def test(suite, case, cfg): From ee7cb890392e8389c2ade5d30cfa81d3ab0ade44 Mon Sep 17 00:00:00 2001 From: Vitaly Stoyan Date: Thu, 2 Jan 2025 21:13:00 +0300 Subject: [PATCH 2/2] fix --- ydb/tests/fq/yt/kqp_yt_file/part12/test.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ydb/tests/fq/yt/kqp_yt_file/part12/test.py b/ydb/tests/fq/yt/kqp_yt_file/part12/test.py index e69de29bb2d1..e154b15b3319 100644 --- a/ydb/tests/fq/yt/kqp_yt_file/part12/test.py +++ b/ydb/tests/fq/yt/kqp_yt_file/part12/test.py @@ -0,0 +1,14 @@ +import yatest + +from kqp_yt_file import run_test, DATA_PATH +from test_utils import pytest_generate_tests_for_part +from yql_utils import pytest_get_current_part + + +def pytest_generate_tests(metafunc): + current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__)) + return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH) + + +def test(suite, case, cfg): + return run_test(suite, case, cfg)