Replaced test/utils/parameters.py

exasol · Sep 24, 2024 · 4285491 · 4285491
1 parent c72cbdf
commit 4285491
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 56 deletions.
diff --git a/tests/deployment/test_scripts_deployer.py b/tests/deployment/test_scripts_deployer.py
@@ -1,17 +1,13 @@
 from exasol_advanced_analytics_framework.deployment.scripts_deployer import \
     ScriptsDeployer
 from tests.utils.db_queries import DBQueries
-from tests.utils.parameters import db_params
 
 
 def test_scripts_deployer(deployed_slc, language_alias, pyexasol_connection, request):
     schema_name = request.node.name
     pyexasol_connection.execute(f"DROP SCHEMA IF EXISTS {schema_name} CASCADE;")
     ScriptsDeployer.run2(
         pyexasol_connection,
-        # dsn=db_params.address(),
-        # user=db_params.user,
-        # password=db_params.password,
         schema=schema_name,
         language_alias=language_alias,
         develop=True)

diff --git a/tests/deployment/test_scripts_deployer_cli.py b/tests/deployment/test_scripts_deployer_cli.py
@@ -1,20 +1,22 @@
 from click.testing import CliRunner
 from exasol_advanced_analytics_framework import deploy
 from tests.utils.db_queries import DBQueries
-from tests.utils.parameters import db_params
 from exasol_advanced_analytics_framework.slc import LANGUAGE_ALIAS
 
 
-@pytest.mark.skip(reason="No need to test deployer provided by PEC.")
 def test_scripts_deployer_cli(upload_language_container,
+                              backend_aware_database_params,
                               pyexasol_connection, request):
     schema_name = request.node.name
     pyexasol_connection.execute(f"DROP SCHEMA IF EXISTS {schema_name} CASCADE;")
+    dsn = backend_aware_database_params["dsn"]
+    user = backend_aware_database_params["user"]
+    password = backend_aware_database_params["password"]
     args_list = [
         "scripts",
-        "--dsn", db_params.address(),
-        "--user", db_params.user,
-        "--pass", db_params.password,
+        "--dsn", dns,
+        "--user", user,
+        "--pass", password,
         "--schema", schema_name,
         "--language-alias", LANGUAGE_ALIAS
     ]

diff --git a/tests/integration_tests/with_db/test_query_loop_integration.py b/tests/integration_tests/with_db/test_query_loop_integration.py
@@ -7,7 +7,6 @@
 
 from tests.test_package.test_query_handlers.query_handler_test import \
     FINAL_RESULT, QUERY_LIST, TEST_INPUT
-from tests.utils.parameters import db_params
 
 QUERY_FLUSH_STATS = """FLUSH STATISTICS"""
 QUERY_AUDIT_LOGS = """

diff --git a/tests/utils/parameters.py b/tests/utils/parameters.py