moved fixture to conftest

Author: mwojtyczka

tests/integration/conftest.py

@@ -1,3 +1,4 @@
+import os
 import logging
 
 from pytest import fixture
@@ -12,9 +13,16 @@
 
 @fixture
 def debug_env_name():
-    return "ucws"
+    return "ws"
 
 
 @fixture
 def product_info():
     return 'pytester', __version__
+
+
+@fixture
+def serverless_env():
+    os.environ['DATABRICKS_SERVERLESS_COMPUTE_ID'] = 'auto'
+    yield
+    os.environ.pop('DATABRICKS_SERVERLESS_COMPUTE_ID')

tests/integration/fixtures/test_connect.py

@@ -1,5 +1,3 @@
-import os
-from pytest import fixture
 from databricks.connect import DatabricksSession
 
 
@@ -36,13 +34,6 @@ def test_databricks_connect_serverless_set_cluster_id(serverless_env, ws, reques
     assert not creator  # serverless clusters don't have assigned creator
 
 
-@fixture
-def serverless_env():
-    os.environ['DATABRICKS_SERVERLESS_COMPUTE_ID'] = 'auto'
-    yield
-    os.environ.pop('DATABRICKS_SERVERLESS_COMPUTE_ID')
-
-
 def get_cluster_creator(spark, ws):
     """
     Get the creator of the cluster that the Spark session is connected to.