Intermediate changes

commit_hash:302db606da88098276d69272eb2346a8ad040a89

1 files changed, 4 insertions, 14 deletions

diff --git a/yql/essentials/tests/common/test_framework/test_utils.py b/yql/essentials/tests/common/test_framework/test_utils.py
index 3b9282eef5..0865245fd9 100644
--- a/yql/essentials/tests/common/test_framework/test_utils.py
+++ b/yql/essentials/tests/common/test_framework/test_utils.py
@@ -9,8 +9,6 @@ from yql_utils import get_param as yql_get_param
 from google.protobuf import text_format
 import yql.essentials.providers.common.proto.gateways_config_pb2 as gateways_config_pb2
 
-# FIXME: remove usage from dq_file/hybrid_file/kqp_yt_file
-DATA_PATH = yatest.common.source_path('yql/essentials/tests/sql/suites')
 try:
     SQLRUN_PATH = yatest.common.binary_path('yql/essentials/tools/sql2yql/sql2yql')
 except BaseException:
@@ -112,11 +110,7 @@ def pytest_generate_tests_for_run(metafunc, template='.sql', suites=None, curren
     )
 
 
-# FIXME make data_path required (dq usage)
 def pytest_generate_tests_for_part(metafunc, currentPart, partsCount, data_path=None, template='.sql', mode_expander=None):
-    if data_path is None:
-        data_path = DATA_PATH
-
     return pytest_generate_tests_for_run(metafunc, currentPart=currentPart, partsCount=partsCount,
                                          data_path=data_path, template=template, mode_expander=mode_expander)
 
@@ -153,10 +147,8 @@ def validate_cfg(result):
             ), "Unknown command in .cfg: %s" % (r[0])
 
 
-# FIXME make data_path required (dq usage)
-def get_config(suite, case, cfg, data_path=None):
-    if data_path is None:
-        data_path = DATA_PATH
+def get_config(suite, case, cfg, data_path):
+    assert data_path is not None
     result = []
     try:
         default_cfg = get_cfg_file('default.txt', case)
@@ -179,10 +171,8 @@ def load_json_file_strip_comments(path):
         return '\n'.join([line for line in file.readlines() if not line.startswith('#')])
 
 
-# FIXME make data_path required (dq usage)
-def get_parameters_files(suite, config, data_path=None):
-    if data_path is None:
-        data_path = DATA_PATH
+def get_parameters_files(suite, config, data_path):
+    assert data_path is not None
 
     result = []
     for line in config: