tweak pytest config

Author: tylerhutcherson

scripts.py

@@ -30,22 +30,20 @@ def check_mypy():
 
 
 def test():
+    test_cmd = ["python", "-m", "pytest", "-n", "auto", "--log-level=CRITICAL"]
     # Get any extra arguments passed to the script
     extra_args = sys.argv[1:]
-    if not extra_args:
-        test_cmd = ["python", "-m", "pytest", "-n", "auto", "--log-level=CRITICAL"]
-    else:
-        test_cmd = ["python", "-m", "pytest", "-n", "auto", "--log-level=CRITICAL"] + extra_args
+    if extra_args:
+        test_cmd.extend(extra_args)
     subprocess.run(test_cmd, check=True)
 
 
 def test_verbose():
+    test_cmd = ["python", "-m", "pytest", "-n", "auto", "-vv", "-s", "--log-level=CRITICAL"]
     # Get any extra arguments passed to the script
     extra_args = sys.argv[1:]
-    if not extra_args:
-        test_cmd = ["python", "-m", "pytest", "-n", "auto", "-vv", "-s", "--log-level=CRITICAL"]
-    else:
-        test_cmd = ["python", "-m", "pytest", "-n", "auto", "-vv", "-s", "--log-level=CRITICAL"] + extra_args
+    if extra_args:
+        test_cmd.extend(extra_args)
     subprocess.run(test_cmd, check=True)
 
 

tests/conftest.py

@@ -54,13 +54,15 @@ async def async_client(redis_url):
     """
     An async Redis client that uses the dynamic `redis_url`.
     """
-    client = await RedisConnectionFactory.get_async_redis_connection(redis_url)
-    yield client
-    try:
-        await client.aclose()
-    except RuntimeError as e:
-        if "Event loop is closed" not in str(e):
-            raise
+    async with await RedisConnectionFactory.get_async_redis_connection(
+        redis_url
+    ) as client:
+        yield client
+        # try:
+        #     await client.aclose()
+        # except RuntimeError as e:
+        #     if "Event loop is closed" not in str(e):
+        #         raise
 
 
 @pytest.fixture
@@ -70,51 +72,51 @@ def client(redis_url):
     """
     conn = RedisConnectionFactory.get_redis_connection(redis_url)
     yield conn
-    conn.close()
+    # conn.close()
 
 
-@pytest.fixture
-def openai_key():
-    return os.getenv("OPENAI_API_KEY")
+# @pytest.fixture
+# def openai_key():
+#     return os.getenv("OPENAI_API_KEY")
 
 
-@pytest.fixture
-def openai_version():
-    return os.getenv("OPENAI_API_VERSION")
+# @pytest.fixture
+# def openai_version():
+#     return os.getenv("OPENAI_API_VERSION")
 
 
-@pytest.fixture
-def azure_endpoint():
-    return os.getenv("AZURE_OPENAI_ENDPOINT")
+# @pytest.fixture
+# def azure_endpoint():
+#     return os.getenv("AZURE_OPENAI_ENDPOINT")
 
 
-@pytest.fixture
-def cohere_key():
-    return os.getenv("COHERE_API_KEY")
+# @pytest.fixture
+# def cohere_key():
+#     return os.getenv("COHERE_API_KEY")
 
 
-@pytest.fixture
-def mistral_key():
-    return os.getenv("MISTRAL_API_KEY")
+# @pytest.fixture
+# def mistral_key():
+#     return os.getenv("MISTRAL_API_KEY")
 
 
-@pytest.fixture
-def gcp_location():
-    return os.getenv("GCP_LOCATION")
+# @pytest.fixture
+# def gcp_location():
+#     return os.getenv("GCP_LOCATION")
 
 
-@pytest.fixture
-def gcp_project_id():
-    return os.getenv("GCP_PROJECT_ID")
+# @pytest.fixture
+# def gcp_project_id():
+#     return os.getenv("GCP_PROJECT_ID")
 
 
-@pytest.fixture
-def aws_credentials():
-    return {
-        "aws_access_key_id": os.getenv("AWS_ACCESS_KEY_ID"),
-        "aws_secret_access_key": os.getenv("AWS_SECRET_ACCESS_KEY"),
-        "aws_region": os.getenv("AWS_REGION", "us-east-1"),
-    }
+# @pytest.fixture
+# def aws_credentials():
+#     return {
+#         "aws_access_key_id": os.getenv("AWS_ACCESS_KEY_ID"),
+#         "aws_secret_access_key": os.getenv("AWS_SECRET_ACCESS_KEY"),
+#         "aws_region": os.getenv("AWS_REGION", "us-east-1"),
+#     }
 
 
 @pytest.fixture
@@ -179,13 +181,29 @@ def sample_data():
     ]
 
 
-@pytest.fixture
-def clear_db(redis):
-    redis.flushall()
-    yield
-    redis.flushall()
+def pytest_addoption(parser: pytest.Parser) -> None:
+    parser.addoption(
+        "--run-api-tests",
+        action="store_true",
+        default=False,
+        help="Run tests that require API keys",
+    )
 
 
-@pytest.fixture
-def app_name():
-    return "test_app"
+def pytest_configure(config: pytest.Config) -> None:
+    config.addinivalue_line(
+        "markers", "requires_api_keys: mark test as requiring API keys"
+    )
+
+
+def pytest_collection_modifyitems(
+    config: pytest.Config, items: list[pytest.Item]
+) -> None:
+    if config.getoption("--run-api-tests"):
+        return
+    skip_api = pytest.mark.skip(
+        reason="Skipping test because API keys are not provided. Use --run-api-tests to run these tests."
+    )
+    for item in items:
+        if item.get_closest_marker("requires_api_keys"):
+            item.add_marker(skip_api)

tests/integration/test_session_manager.py

@@ -12,6 +12,11 @@
 from redisvl.utils.vectorize.text.huggingface import HFTextVectorizer
 
 
+@pytest.fixture
+def app_name():
+    return "test_app"
+
+
 @pytest.fixture
 def standard_session(app_name, client):
     session = StandardSessionManager(app_name, redis_client=client)