refactor

databrickslabs · Feb 1, 2025 · 8a37122 · 8a37122
1 parent 625819e
commit 8a37122
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml
@@ -52,4 +52,3 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }}
           ARM_TENANT_ID: ${{ secrets.ARM_TENANT_ID }}
-          DATABRICKS_CLUSTER_ID: ${{ secrets.TEST_USER_ISOLATION_CLUSTER_ID }}
diff --git a/tests/integration/fixtures/test_connect.py b/tests/integration/fixtures/test_connect.py
@@ -12,6 +12,11 @@ def serverless_env():
     os.environ.pop('DATABRICKS_SERVERLESS_COMPUTE_ID')
 
 
+@fixture
+def set_shared_cluster(monkeypatch, debug_env, env_or_skip):
+    monkeypatch.setitem(debug_env, "DATABRICKS_CLUSTER_ID", env_or_skip("TEST_USER_ISOLATION_CLUSTER_ID"))
+
+
 @fixture
 def spark_serverless_cluster_id(ws):
     # get new spark session with serverless cluster outside the actual spark fixture under test
@@ -23,7 +28,7 @@ def spark_serverless_cluster_id(ws):
     spark_serverless.stop()
 
 
-def test_databricks_connect(ws, spark):
+def test_databricks_connect(set_shared_cluster, ws, spark):
     rows = spark.sql("SELECT 1").collect()
     assert rows[0][0] == 1
     assert not is_serverless_cluster(spark, ws)