Fix core connector whitelists in tests (#41)

datalens-tech · Oct 25, 2023 · 26b9107 · 26b9107
1 parent 8027244
commit 26b9107
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 6 deletions.
diff --git a/lib/dl_connector_oracle/dl_connector_oracle_tests/db/config.py b/lib/dl_connector_oracle/dl_connector_oracle_tests/db/config.py
@@ -15,6 +15,7 @@
     host_us_pg=get_test_container_hostport("pg-us", fallback_port=51810).host,
     port_us_pg_5432=get_test_container_hostport("pg-us", fallback_port=51810).port,
     us_master_token="AC1ofiek8coB",
+    core_connector_ep_names=["oracle"],
 )
 
 COMPOSE_PROJECT_NAME = os.environ.get("COMPOSE_PROJECT_NAME", "dl_connector_oracle")

diff --git a/lib/dl_core/dl_core_tests/db/config.py b/lib/dl_core/dl_core_tests/db/config.py
@@ -11,6 +11,7 @@
     host_us_pg=get_test_container_hostport("pg-us", fallback_port=50309).host,
     port_us_pg_5432=get_test_container_hostport("pg-us", fallback_port=50309).port,
     us_master_token="AC1ofiek8coB",
+    core_connector_ep_names=["clickhouse"],
 )
 
 

diff --git a/lib/dl_file_uploader_api_lib/dl_file_uploader_api_lib_tests/config.py b/lib/dl_file_uploader_api_lib/dl_file_uploader_api_lib_tests/config.py
@@ -6,6 +6,9 @@
 )
 
 
+CONNECTOR_WHITELIST = ["clickhouse", "file", "gsheets_v2"]
+
+
 @attr.s(kw_only=True)
 class TestingUSConfig:
     container_name: str = attr.ib(default="bi_file_uploader_api_us-tests")

diff --git a/lib/dl_file_uploader_api_lib/dl_file_uploader_api_lib_tests/conftest.py b/lib/dl_file_uploader_api_lib/dl_file_uploader_api_lib_tests/conftest.py
@@ -37,7 +37,10 @@
     S3Settings,
 )
 from dl_constants.api_constants import DLHeadersCommon
-from dl_core.loader import load_core_lib
+from dl_core.loader import (
+    CoreLibraryConfig,
+    load_core_lib,
+)
 from dl_core.services_registry.top_level import DummyServiceRegistry
 from dl_core.united_storage_client import USAuthContextMaster
 from dl_core.us_manager.us_manager_async import AsyncUSManager
@@ -71,7 +74,10 @@
 
 from dl_connector_bundle_chs3.chs3_base.core.settings import FileS3ConnectorSettings
 
-from .config import TestingUSConfig
+from dl_file_uploader_api_lib_tests.config import (
+    CONNECTOR_WHITELIST,
+    TestingUSConfig,
+)
 
 
 if TYPE_CHECKING:
@@ -124,7 +130,7 @@ def us_config():
 
 @pytest.fixture(scope="session", autouse=True)
 def loaded_libraries():
-    load_core_lib()
+    load_core_lib(core_lib_config=CoreLibraryConfig(core_connector_ep_names=CONNECTOR_WHITELIST))
 
 
 @pytest.fixture(scope="session")

diff --git a/lib/dl_file_uploader_worker_lib/dl_file_uploader_worker_lib_tests/config.py b/lib/dl_file_uploader_worker_lib/dl_file_uploader_worker_lib_tests/config.py
@@ -6,6 +6,9 @@
 )
 
 
+CONNECTOR_WHITELIST = ["clickhouse", "file", "gsheets_v2"]
+
+
 @attr.s(kw_only=True)
 class TestingUSConfig:
     master_token: str = attr.ib(default="AC1ofiek8coB")

diff --git a/lib/dl_file_uploader_worker_lib/dl_file_uploader_worker_lib_tests/conftest.py b/lib/dl_file_uploader_worker_lib/dl_file_uploader_worker_lib_tests/conftest.py
@@ -21,7 +21,10 @@
     RedisSettings,
     S3Settings,
 )
-from dl_core.loader import load_core_lib
+from dl_core.loader import (
+    CoreLibraryConfig,
+    load_core_lib,
+)
 from dl_core.services_registry.top_level import DummyServiceRegistry
 from dl_core.united_storage_client import USAuthContextMaster
 from dl_core.us_manager.us_manager_async import AsyncUSManager
@@ -64,7 +67,10 @@
 
 from dl_connector_bundle_chs3.chs3_base.core.settings import FileS3ConnectorSettings
 
-from .config import TestingUSConfig
+from dl_file_uploader_worker_lib_tests.config import (
+    CONNECTOR_WHITELIST,
+    TestingUSConfig,
+)
 
 
 if TYPE_CHECKING:
@@ -106,7 +112,7 @@ def rci() -> RequestContextInfo:
 
 @pytest.fixture(scope="session", autouse=True)
 def loaded_libraries():
-    load_core_lib()
+    load_core_lib(core_lib_config=CoreLibraryConfig(core_connector_ep_names=CONNECTOR_WHITELIST))
 
 
 @pytest.fixture(scope="session")