Switch kqp yt tests to yt suites (#13152)

ydb-platform · Jan 2, 2025 · 916a423 · 916a423
1 parent 77b7c35
commit 916a423
Show file tree

Hide file tree

Showing 22 changed files with 49 additions and 45 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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):