make redshift optional

data-dot-all · Oct 21, 2024 · d3da001 · d3da001
1 parent 13c615f
commit d3da001
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/tests_new/integration_tests/conftest.py b/tests_new/integration_tests/conftest.py
@@ -54,8 +54,8 @@ class RedshiftConnection:
 class TestData:
     users: dict[str, User]
     envs: dict[str, Env]
-    dashboards: dict[str, Dashboard]
-    redshift_connections: dict[str, RedshiftConnection]
+    dashboards: dict[str, Dashboard] = None
+    redshift_connections: dict[str, RedshiftConnection] = None
 
 
 @pytest.fixture(scope='session', autouse=True)

diff --git a/tests_new/integration_tests/modules/redshift_datasets/global_conftest.py b/tests_new/integration_tests/modules/redshift_datasets/global_conftest.py
@@ -57,14 +57,21 @@ def create_connection(client, env, group, name, conn_type, red_type, connection_
     return connection
 
 
+@pytest.fixture(scope='session')
+def redshift_connections(testdata):
+    if testdata.redshift_connections:
+        return testdata.redshift_connections
+    pytest.skip('redshift config is missing')
+
+
 """
 - Serverless namespace is deployed in session_env1 account
 - Provisioned cluster is deployed in session_cross_acc_env_1
 """
 
 
 @pytest.fixture(scope='session')
-def session_connection_serverless_admin(client1, group1, session_env1, testdata):
+def session_connection_serverless_admin(client1, group1, session_env1, redshift_connections):
     connection = None
     try:
         connection = create_connection(
@@ -74,7 +81,7 @@ def session_connection_serverless_admin(client1, group1, session_env1, testdata)
             env=session_env1,
             group=group1,
             red_type='serverless',
-            connection_data=testdata.redshift_connections['connection_serverless_admin_session_env1'],
+            connection_data=redshift_connections['connection_serverless_admin_session_env1'],
         )
 
         yield connection
@@ -102,7 +109,7 @@ def session_connection_serverless_admin_group_with_permissions(client1, group5,
 
 
 @pytest.fixture(scope='session')
-def session_connection_serverless_data_user(client1, group1, session_env1, testdata):
+def session_connection_serverless_data_user(client1, group1, session_env1, redshift_connections):
     connection = None
     try:
         connection = create_connection(
@@ -112,7 +119,7 @@ def session_connection_serverless_data_user(client1, group1, session_env1, testd
             env=session_env1,
             group=group1,
             red_type='serverless',
-            connection_data=testdata.redshift_connections['connection_serverless_data_user_session_env1'],
+            connection_data=redshift_connections['connection_serverless_data_user_session_env1'],
         )
         yield connection
     finally:
@@ -121,7 +128,7 @@ def session_connection_serverless_data_user(client1, group1, session_env1, testd
 
 
 @pytest.fixture(scope='session')
-def session_connection_cluster_admin(client5, group5, session_cross_acc_env_1, testdata):
+def session_connection_cluster_admin(client5, group5, session_cross_acc_env_1, redshift_connections):
     connection = None
     try:
         connection = create_connection(
@@ -131,7 +138,7 @@ def session_connection_cluster_admin(client5, group5, session_cross_acc_env_1, t
             env=session_cross_acc_env_1,
             group=group5,
             red_type='cluster',
-            connection_data=testdata.redshift_connections['connection_cluster_admin_session_cross_acc_env_1'],
+            connection_data=redshift_connections['connection_cluster_admin_session_cross_acc_env_1'],
         )
         yield connection
     finally:
@@ -140,7 +147,7 @@ def session_connection_cluster_admin(client5, group5, session_cross_acc_env_1, t
 
 
 @pytest.fixture(scope='session')
-def session_connection_cluster_data_user(client5, group5, session_cross_acc_env_1, testdata):
+def session_connection_cluster_data_user(client5, group5, session_cross_acc_env_1, redshift_connections):
     connection = None
     try:
         connection = create_connection(
@@ -150,7 +157,7 @@ def session_connection_cluster_data_user(client5, group5, session_cross_acc_env_
             env=session_cross_acc_env_1,
             group=group5,
             red_type='cluster',
-            connection_data=testdata.redshift_connections['connection_cluster_data_user_session_cross_acc_env_1'],
+            connection_data=redshift_connections['connection_cluster_data_user_session_cross_acc_env_1'],
         )
         yield connection
     finally: