From 3268e7036883f70559a99789a045acbe71128de8 Mon Sep 17 00:00:00 2001 From: okreda1 <58815851+okreda1@users.noreply.github.com> Date: Tue, 15 Oct 2024 23:39:17 +0300 Subject: [PATCH] IGNITE-23016 Fix implicit use of the direct-io on a dev branch in ducktests (#11554) --- .../tests/ignitetest/services/utils/ignite_spec.py | 7 ++++++- .../tests/ignitetest/tests/thin_client_query_test.py | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/ducktests/tests/ignitetest/services/utils/ignite_spec.py b/modules/ducktests/tests/ignitetest/services/utils/ignite_spec.py index 70bacf587e1c6..223757b081dfc 100644 --- a/modules/ducktests/tests/ignitetest/services/utils/ignite_spec.py +++ b/modules/ducktests/tests/ignitetest/services/utils/ignite_spec.py @@ -249,13 +249,18 @@ def envs(self): """ :return: environment set. """ - return { + environment_dict = { 'EXCLUDE_TEST_CLASSES': 'true', 'IGNITE_LOG_DIR': self.service.log_dir, 'USER_LIBS': ":".join(self.libs()), "MAIN_CLASS": self.service.main_java_class } + if "direct-io" not in self.modules(): + environment_dict['EXCLUDE_MODULES'] = "direct-io" + + return environment_dict + def config_file_path(self): """ :return: path to project configuration file diff --git a/modules/ducktests/tests/ignitetest/tests/thin_client_query_test.py b/modules/ducktests/tests/ignitetest/tests/thin_client_query_test.py index e008878159a68..f75c031c788cf 100644 --- a/modules/ducktests/tests/ignitetest/tests/thin_client_query_test.py +++ b/modules/ducktests/tests/ignitetest/tests/thin_client_query_test.py @@ -90,6 +90,9 @@ def envs(self): """ envs = super().envs() - envs["EXCLUDE_MODULES"] = "ducktests" + if envs.get("EXCLUDE_MODULES") is not None: + envs["EXCLUDE_MODULES"] = envs["EXCLUDE_MODULES"] + ",ducktests" + else: + envs["EXCLUDE_MODULES"] = "ducktests" return envs