Skip to content

Commit 916a423

Browse files
authored
Switch kqp yt tests to yt suites (#13152)
1 parent 77b7c35 commit 916a423

File tree

22 files changed

+49
-45
lines changed

22 files changed

+49
-45
lines changed

ydb/tests/fq/yt/kqp_yt_file.make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ DEPENDS(
2323

2424
DATA(
2525
arcadia/ydb/library/yql/tests/sql
26-
arcadia/yql/essentials/tests/sql/suites
26+
arcadia/yt/yql/tests/sql/suites
2727
arcadia/ydb/tests/fq/yt
2828
arcadia/ydb/tests/fq/yt/cfg
2929
)

ydb/tests/fq/yt/kqp_yt_file.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@
22

33
import pytest
44

5+
import yatest.common
56
from test_file_common import check_provider, get_sql_query
67
from kqprun import KqpRun
7-
from test_utils import DATA_PATH, get_config, get_parameters_files, replace_vars
8+
from test_utils import get_config, get_parameters_files, replace_vars
89
from yql_utils import KSV_ATTR, get_files, get_http_files, get_tables, is_xfail, yql_binary_path, yql_source_path
910

11+
12+
DATA_PATH = yatest.common.source_path('yt/yql/tests/sql/suites')
13+
1014
EXCLUDED_SUITES = [
1115
]
1216

@@ -181,16 +185,16 @@ def run_test(suite, case, cfg):
181185

182186

183187
def run_file_kqp_no_cache(suite, case, cfg):
184-
config = get_config(suite, case, cfg)
188+
config = get_config(suite, case, cfg, data_path=DATA_PATH)
185189
in_tables = get_tables(suite, config, DATA_PATH, def_attr=KSV_ATTR)[0]
186190

187-
sql_query = get_sql_query('yt', suite, case, config)
191+
sql_query = get_sql_query('yt', suite, case, config, data_path=DATA_PATH)
188192
sql_query = replace_vars(sql_query, "yqlrun_var")
189193

190194
check_provider('yt', config)
191195
validate_sql(sql_query)
192196

193-
if get_parameters_files(suite, config):
197+
if get_parameters_files(suite, config, data_path=DATA_PATH):
194198
pytest.skip('params is not supported in KqpRun')
195199

196200
if get_files(suite, config, DATA_PATH) or get_http_files(suite, config, DATA_PATH):

ydb/tests/fq/yt/kqp_yt_file/part0/test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import yatest
22

3-
from kqp_yt_file import run_test
3+
from kqp_yt_file import run_test, DATA_PATH
44
from test_utils import pytest_generate_tests_for_part
55
from yql_utils import pytest_get_current_part
66

77

88
def pytest_generate_tests(metafunc):
99
current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
10-
return pytest_generate_tests_for_part(metafunc, current_part, part_count)
10+
return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH)
1111

1212

1313
def test(suite, case, cfg):

ydb/tests/fq/yt/kqp_yt_file/part1/test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import yatest
22

3-
from kqp_yt_file import run_test
3+
from kqp_yt_file import run_test, DATA_PATH
44
from test_utils import pytest_generate_tests_for_part
55
from yql_utils import pytest_get_current_part
66

77

88
def pytest_generate_tests(metafunc):
99
current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
10-
return pytest_generate_tests_for_part(metafunc, current_part, part_count)
10+
return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH)
1111

1212

1313
def test(suite, case, cfg):

ydb/tests/fq/yt/kqp_yt_file/part10/test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import yatest
22

3-
from kqp_yt_file import run_test
3+
from kqp_yt_file import run_test, DATA_PATH
44
from test_utils import pytest_generate_tests_for_part
55
from yql_utils import pytest_get_current_part
66

77

88
def pytest_generate_tests(metafunc):
99
current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
10-
return pytest_generate_tests_for_part(metafunc, current_part, part_count)
10+
return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH)
1111

1212

1313
def test(suite, case, cfg):

ydb/tests/fq/yt/kqp_yt_file/part11/test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import yatest
22

3-
from kqp_yt_file import run_test
3+
from kqp_yt_file import run_test, DATA_PATH
44
from test_utils import pytest_generate_tests_for_part
55
from yql_utils import pytest_get_current_part
66

77

88
def pytest_generate_tests(metafunc):
99
current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
10-
return pytest_generate_tests_for_part(metafunc, current_part, part_count)
10+
return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH)
1111

1212

1313
def test(suite, case, cfg):

ydb/tests/fq/yt/kqp_yt_file/part12/test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import yatest
22

3-
from kqp_yt_file import run_test
3+
from kqp_yt_file import run_test, DATA_PATH
44
from test_utils import pytest_generate_tests_for_part
55
from yql_utils import pytest_get_current_part
66

77

88
def pytest_generate_tests(metafunc):
99
current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
10-
return pytest_generate_tests_for_part(metafunc, current_part, part_count)
10+
return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH)
1111

1212

1313
def test(suite, case, cfg):

ydb/tests/fq/yt/kqp_yt_file/part13/test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import yatest
22

3-
from kqp_yt_file import run_test
3+
from kqp_yt_file import run_test, DATA_PATH
44
from test_utils import pytest_generate_tests_for_part
55
from yql_utils import pytest_get_current_part
66

77

88
def pytest_generate_tests(metafunc):
99
current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
10-
return pytest_generate_tests_for_part(metafunc, current_part, part_count)
10+
return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH)
1111

1212

1313
def test(suite, case, cfg):

ydb/tests/fq/yt/kqp_yt_file/part14/test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import yatest
22

3-
from kqp_yt_file import run_test
3+
from kqp_yt_file import run_test, DATA_PATH
44
from test_utils import pytest_generate_tests_for_part
55
from yql_utils import pytest_get_current_part
66

77

88
def pytest_generate_tests(metafunc):
99
current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
10-
return pytest_generate_tests_for_part(metafunc, current_part, part_count)
10+
return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH)
1111

1212

1313
def test(suite, case, cfg):

ydb/tests/fq/yt/kqp_yt_file/part15/test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import yatest
22

3-
from kqp_yt_file import run_test
3+
from kqp_yt_file import run_test, DATA_PATH
44
from test_utils import pytest_generate_tests_for_part
55
from yql_utils import pytest_get_current_part
66

77

88
def pytest_generate_tests(metafunc):
99
current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
10-
return pytest_generate_tests_for_part(metafunc, current_part, part_count)
10+
return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH)
1111

1212

1313
def test(suite, case, cfg):

0 commit comments

Comments
 (0)