Added better endpoitns handling

Author: vladvildanov

tests/conftest.py

@@ -168,6 +168,13 @@ def pytest_addoption(parser):
         help="Name of the Redis master service that the sentinels are monitoring",
     )
 
+    parser.addoption(
+        "--endpoint-name",
+        action="store",
+        default=None,
+        help="Name of the Redis endpoint the tests should be executed on",
+    )
+
 
 def _get_info(redis_url):
     client = redis.Redis.from_url(redis_url)
@@ -352,13 +359,6 @@ def _get_client(
     else:
         redis_url = from_url
 
-    endpoints_config = os.getenv("REDIS_ENDPOINTS_CONFIG_PATH", None)
-    if endpoints_config is not None:
-        with open(endpoints_config, 'r') as f:
-            data = json.load(f)
-            db = next(iter(data.values()))
-            redis_url = db['endpoints'][0]
-
     redis_tls_url = request.config.getoption("--redis-ssl-url")
 
     if "protocol" not in redis_url and kwargs.get("protocol") is None:
@@ -723,6 +723,25 @@ def credential_provider(request) -> CredentialProvider:
     return get_credential_provider(request)
 
 
+def get_endpoint(endpoint_name: str):
+    endpoints_config = os.getenv("REDIS_ENDPOINTS_CONFIG_PATH", None)
+
+    if not (endpoints_config and os.path.exists(endpoints_config)):
+        raise FileNotFoundError(
+            f"Endpoints config file not found: {endpoints_config}"
+        )
+
+    try:
+        with open(endpoints_config, 'r') as f:
+            data = json.load(f)
+            db = data[endpoint_name]
+            return db['endpoints'][0]
+    except Exception as e:
+        raise ValueError(
+            f"Failed to load endpoints config file: {endpoints_config}"
+        ) from e
+
+
 def wait_for_command(client, monitor, command, key=None):
     # issue a command with a key name that's local to this process.
     # if we find a command with our key before the command we're waiting

tests/test_asyncio/test_credentials.py

@@ -18,12 +18,23 @@
 from redis.backoff import NoBackoff
 from redis.credentials import CredentialProvider, UsernamePasswordCredentialProvider
 from redis.utils import str_if_bytes
-from tests.conftest import skip_if_redis_enterprise
+from tests.conftest import skip_if_redis_enterprise, get_endpoint
 from tests.test_asyncio.conftest import get_credential_provider
 
 
+@pytest.fixture()
+def endpoint(request):
+    endpoint_name = request.config.getoption("--endpoint-name")
+
+    try:
+        return get_endpoint(endpoint_name)
+    except FileNotFoundError as e:
+        pytest.skip(
+            f"Skipping scenario test because endpoints file is missing: {str(e)}"
+        )
+
 @pytest_asyncio.fixture()
-async def r_credential(request, create_redis):
+async def r_credential(request, create_redis, endpoint):
     credential_provider = request.param.get("cred_provider_class", None)
 
     if credential_provider is not None:
@@ -33,7 +44,7 @@ async def r_credential(request, create_redis):
         "credential_provider": credential_provider,
     }
 
-    return await create_redis(**kwargs)
+    return await create_redis(url=endpoint, **kwargs)
 
 
 @pytest_asyncio.fixture()

tests/test_credentials.py

@@ -1,4 +1,6 @@
 import functools
+import json
+import os
 import random
 import string
 import threading
@@ -22,11 +24,23 @@
 from redis.credentials import CredentialProvider, UsernamePasswordCredentialProvider
 from redis.retry import Retry
 from redis.utils import str_if_bytes
-from tests.conftest import _get_client, skip_if_redis_enterprise, get_credential_provider
+from tests.conftest import _get_client, skip_if_redis_enterprise, get_credential_provider, get_endpoint
 
 
 @pytest.fixture()
-def r(request):
+def endpoint(request):
+    endpoint_name = request.config.getoption("--endpoint-name")
+
+    try:
+        return get_endpoint(endpoint_name)
+    except FileNotFoundError as e:
+        pytest.skip(
+            f"Skipping scenario test because endpoints file is missing: {str(e)}"
+        )
+
+
+@pytest.fixture()
+def r_entra(request, endpoint):
     credential_provider = request.param.get("cred_provider_class", None)
     single_connection = request.param.get("single_connection_client", False)
 
@@ -38,6 +52,7 @@ def r(request):
         request,
         credential_provider=credential_provider,
         single_connection_client=single_connection,
+        from_url=endpoint
     ) as client:
         yield client
 
@@ -502,7 +517,7 @@ def re_auth_callback(token):
 @pytest.mark.cp_integration
 class TestEntraIdCredentialsProvider:
     @pytest.mark.parametrize(
-        "r",
+        "r_entra",
         [
             {
                 "cred_provider_class": EntraIdCredentialsProvider,
@@ -518,8 +533,8 @@ class TestEntraIdCredentialsProvider:
     )
     @pytest.mark.onlynoncluster
     @pytest.mark.cp_integration
-    def test_auth_pool_with_credential_provider(self, r: redis.Redis):
-        assert r.ping() is True
+    def test_auth_pool_with_credential_provider(self, r_entra: redis.Redis):
+        assert r_entra.ping() is True
 
     @pytest.mark.parametrize(
         "r",