remove global

Author: nealrichardson

pins/tests/conftest.py

@@ -13,7 +13,6 @@
     RscBoardBuilder,
     Snapshot,
     rm_env,
-    set_rsc_api_keys,
 )
 
 EXAMPLE_REL_PATH = "pins/tests/pins-compat"
@@ -34,14 +33,17 @@
 ]
 
 # rsc should only be used once, because users are created at docker setup time
-param_rsc = pytest.param(lambda: RscBoardBuilder("rsc"), id="rsc", marks=m.fs_rsc)
+param_rsc = pytest.param(lambda api_keys: RscBoardBuilder("rsc", api_keys=api_keys), id="rsc", marks=m.fs_rsc)
 
 params_backend = [*params_safe, param_rsc]
 
 
 @pytest.fixture(params=params_backend, scope="session")
-def backend(request):
-    backend = request.param()
+def backend(request, rsc_api_keys):
+    if request.param.__name__ == "<lambda>" and "rsc" in request.node.name:
+        backend = request.param(rsc_api_keys)
+    else:
+        backend = request.param()
     yield backend
     backend.teardown()
 
@@ -117,7 +119,6 @@ def rsc_api_keys(request):
             user["username"], user["password"]
         ).create_api_key()
 
-    set_rsc_api_keys(api_keys)
     return api_keys
 
 

pins/tests/helpers.py

@@ -19,7 +19,6 @@
 DEFAULT_CREATION_DATE = datetime(2020, 1, 13, 23, 58, 59)
 
 RSC_SERVER_URL = os.getenv("CONNECT_SERVER")
-_RSC_API_KEYS = None
 
 DATABRICKS_VOLUME = "/Volumes/workshops/my-board/my-volume/test"
 
@@ -75,24 +74,17 @@ def wrapper(*args, **kwargs):
     return wrapper
 
 
-def set_rsc_api_keys(keys):
-    global _RSC_API_KEYS
-    _RSC_API_KEYS = keys
-
-
-def rsc_from_key(name):
+def rsc_from_key(name, api_keys):
     from pins.rsconnect.api import RsConnectApi
 
-    if _RSC_API_KEYS is None:
-        raise RuntimeError("RSC API keys not initialized. This should be set by the pytest fixture.")
-    api_key = _RSC_API_KEYS[name]
+    api_key = api_keys[name]
     return RsConnectApi(RSC_SERVER_URL, api_key)
 
 
-def rsc_fs_from_key(name):
+def rsc_fs_from_key(name, api_keys):
     from pins.rsconnect.fs import RsConnectFs
 
-    rsc = rsc_from_key(name)
+    rsc = rsc_from_key(name, api_keys)
 
     return RsConnectFs(rsc)
 
@@ -211,14 +203,15 @@ class RscBoardBuilder(BoardBuilder):
 
     # TODO: could loop back once initializing all boards is clear
 
-    def __init__(self, fs_name, path=None, *args, **kwargs):
+    def __init__(self, fs_name, path=None, api_keys=None, *args, **kwargs):
         self.fs_name = fs_name
         self.path = None
+        self.api_keys = api_keys
 
     def create_tmp_board(self, src_board=None, versioned=True):
         from pins.rsconnect.fs import PinBundleManifest  # noqa
 
-        board = BoardRsConnect("", rsc_fs_from_key("derek"), versioned=versioned)
+        board = BoardRsConnect("", rsc_fs_from_key("derek", self.api_keys), versioned=versioned)
         if src_board is None:
             return board
 

pins/tests/test_rsconnect_api.py

@@ -25,8 +25,8 @@
 
 
 @pytest.fixture(scope="session")
-def rsc_admin():
-    rsc_admin = rsc_from_key("admin")
+def rsc_admin(rsc_api_keys):
+    rsc_admin = rsc_from_key("admin", rsc_api_keys)
 
     yield rsc_admin
 
@@ -38,9 +38,9 @@ def rsc_admin():
 
 
 @pytest.fixture(scope="function")
-def rsc_short():
+def rsc_short(rsc_api_keys):
     # tears down content after each test
-    rsc_susan = rsc_from_key("susan")
+    rsc_susan = rsc_from_key("susan", rsc_api_keys)
 
     # delete any content that might already exist
     rsc_delete_user_content(rsc_susan)
@@ -51,8 +51,8 @@ def rsc_short():
 
 
 @pytest.fixture
-def fs_admin():
-    return RsConnectFs(rsc_from_key("admin"))
+def fs_admin(rsc_api_keys):
+    return RsConnectFs(rsc_from_key("admin", rsc_api_keys))
 
 
 @pytest.fixture