Intermediate changes

commit_hash:5b0aadf271c553415c536606ff7f52575bd267c4

4 files changed, 8 insertions, 8 deletions

diff --git a/yql/essentials/tests/sql/minirun/pure.py b/yql/essentials/tests/sql/minirun/pure.py
index 3ec17bb2fa0..d84a4c80aa7 100644
--- a/yql/essentials/tests/sql/minirun/pure.py
+++ b/yql/essentials/tests/sql/minirun/pure.py
@@ -12,7 +12,7 @@ from yql_utils import execute, get_tables, get_files, get_http_files, \
     normalize_result, get_langver
 from yqlrun import YQLRun
 
-from test_utils import get_config, get_parameters_json
+from test_utils import get_config, get_parameters_json, get_case_file
 from test_file_common import run_file, run_file_no_cache, get_gateways_config, get_sql_query
 
 DEFAULT_LANG_VER = '2025.01'
@@ -48,7 +48,7 @@ def run_test(suite, case, cfg, tmpdir, what, yql_http_file_server):
     if xfail and what != 'Results':
         pytest.skip('xfail is not supported in this mode')
 
-    program_sql = os.path.join(DATA_PATH, suite, '%s.sql' % case)
+    program_sql = get_case_file(DATA_PATH, suite, case, {'.sql', '.yql'})
     with codecs.open(program_sql, encoding='utf-8') as program_file_descr:
         sql_query = program_file_descr.read()
 
diff --git a/yql/essentials/tests/sql/sql2yql/test_sql2yql.py b/yql/essentials/tests/sql/sql2yql/test_sql2yql.py
index c8f5bbcd845..bead20d966d 100644
--- a/yql/essentials/tests/sql/sql2yql/test_sql2yql.py
+++ b/yql/essentials/tests/sql/sql2yql/test_sql2yql.py
@@ -2,7 +2,7 @@ import os
 
 import yatest.common
 
-from test_utils import get_config, pytest_generate_tests_by_template, SQLRUN_PATH, SQL_FLAGS
+from test_utils import get_config, pytest_generate_tests_by_template, SQLRUN_PATH, SQL_FLAGS, get_case_file
 
 from yql_utils import get_langver
 
@@ -11,7 +11,7 @@ DATA_PATH = yatest.common.source_path('yql/essentials/tests/sql/suites')
 
 
 def pytest_generate_tests(metafunc):
-    return pytest_generate_tests_by_template('.sql', metafunc, data_path=DATA_PATH)
+    return pytest_generate_tests_by_template({'.sql', '.yql'}, metafunc, data_path=DATA_PATH)
 
 
 def _get_cfg_path(suite, case, data_path):
@@ -81,7 +81,7 @@ def test(suite, case, tmpdir):
     files = []
     # case can contain slash because of nested suites
     out_dir = tmpdir.mkdir(suite).mkdir(case.replace('/', '_')).dirname
-    case_file = os.path.join(DATA_PATH, suite, '%s.sql' % case)
+    case_file = get_case_file(DATA_PATH, suite, case, {'.sql', '.yql'})
     with open(case_file, 'r') as f:
         content = f.read()
         ansi_lexer = 'ansi_lexer' in content
diff --git a/yql/essentials/tests/sql/sql2yql/test_sql_format.py b/yql/essentials/tests/sql/sql2yql/test_sql_format.py
index fdf2ca75e88..6e97535b61a 100644
--- a/yql/essentials/tests/sql/sql2yql/test_sql_format.py
+++ b/yql/essentials/tests/sql/sql2yql/test_sql_format.py
@@ -3,20 +3,20 @@ import yatest.common
 import pytest
 
 from test_sql2yql import get_sql2yql_cmd
-from test_utils import pytest_generate_tests_by_template
+from test_utils import pytest_generate_tests_by_template, get_case_file
 
 DATA_PATH = yatest.common.source_path('yql/essentials/tests/sql/suites')
 
 
 def pytest_generate_tests(metafunc):
-    return pytest_generate_tests_by_template('.sql', metafunc, data_path=DATA_PATH)
+    return pytest_generate_tests_by_template({'.sql', '.yql'}, metafunc, data_path=DATA_PATH)
 
 
 def test(suite, case, tmpdir):
     files = []
     # case can contain slash because of nested suites
     out_dir = tmpdir.mkdir(suite).mkdir(case.replace('/', '_')).dirname
-    case_file = os.path.join(DATA_PATH, suite, '%s.sql' % case)
+    case_file = get_case_file(DATA_PATH, suite, case, {'.sql', '.yql'})
     ansi_lexer = False
     with open(case_file, 'r') as f:
         content = f.read()
diff --git a/yql/essentials/tests/sql/suites/select/values.sql b/yql/essentials/tests/sql/suites/select/values.yql
index 345513ede5e..345513ede5e 100644
--- a/yql/essentials/tests/sql/suites/select/values.sql
+++ b/yql/essentials/tests/sql/suites/select/values.yql