Split fixtures

Author: btschwertfeger

tests/cli/conftest.py

@@ -23,29 +23,45 @@ def cli_runner() -> CliRunner:
 
 
 @pytest.fixture
-def with_cli_env_vars() -> Generator:
+def with_spot_secrets() -> Generator:
     """Setup some environment variables for th CLI tests"""
 
     if not all(
         (
             spot_api_key := os.getenv("SPOT_API_KEY"),
             spot_secret_key := os.getenv("SPOT_SECRET_KEY"),
-            futures_api_key := os.getenv("FUTURES_API_KEY"),
-            futures_secret_key := os.getenv("FUTURES_SECRET_KEY"),
         ),
     ):
         pytest.fail("No API keys provided for CLI tests!")
 
     os.environ["KRAKEN_SPOT_API_KEY"] = spot_api_key
     os.environ["KRAKEN_SPOT_SECRET_KEY"] = spot_secret_key
+
+    yield
+
+    for var in ("KRAKEN_SPOT_API_KEY", "KRAKEN_SPOT_SECRET_KEY"):
+        if os.getenv(var):
+            del os.environ[var]
+
+
+@pytest.fixture
+def with_futures_secrets() -> Generator:
+    """Setup some environment variables for the CLI tests"""
+
+    if not all(
+        (
+            futures_api_key := os.getenv("FUTURES_API_KEY"),
+            futures_secret_key := os.getenv("FUTURES_SECRET_KEY"),
+        ),
+    ):
+        pytest.fail("No API keys provided for CLI tests!")
+
     os.environ["KRAKEN_FUTURES_API_KEY"] = futures_api_key
     os.environ["KRAKEN_FUTURES_SECRET_KEY"] = futures_secret_key
 
     yield
 
     for var in (
-        "KRAKEN_SPOT_API_KEY",
-        "KRAKEN_SPOT_SECRET_KEY",
         "KRAKEN_FUTURES_API_KEY",
         "KRAKEN_FUTURES_SECRET_KEY",
     ):

tests/cli/test_cli.py

@@ -67,7 +67,7 @@ def test_cli_spot_public(cli_runner: CliRunner, args: list[str]) -> None:
     assert result.exit_code == 0
 
 
-@pytest.mark.usefixtures("with_cli_env_vars")
+@pytest.mark.usefixtures("with_spot_secrets")
 @pytest.mark.spot
 @pytest.mark.spot_auth
 @pytest.mark.parametrize(
@@ -122,7 +122,7 @@ def test_cli_futures_public(cli_runner: CliRunner, args: list[str]) -> None:
     assert result.exit_code == 0
 
 
-@pytest.mark.usefixtures("with_cli_env_vars")
+@pytest.mark.usefixtures("with_futures_secrets")
 @pytest.mark.futures
 @pytest.mark.futures_auth
 @pytest.mark.parametrize(