Added an option to parse endpoint from endpoints.json

Author: vladvildanov

tests/conftest.py

@@ -1,4 +1,5 @@
 import argparse
+import json
 import os
 import random
 import time
@@ -345,6 +346,13 @@ 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:

tests/test_asyncio/conftest.py

@@ -1,3 +1,4 @@
+import json
 import os
 import random
 from contextlib import asynccontextmanager as _asynccontextmanager
@@ -64,6 +65,13 @@ async def client_factory(
         if "protocol" not in url and kwargs.get("protocol") is None:
             kwargs["protocol"] = request.config.getoption("--protocol")
 
+        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()))
+                url = db['endpoints'][0]
+
         cluster_mode = REDIS_INFO["cluster_enabled"]
         if not cluster_mode:
             single = kwargs.pop("single_connection_client", False) or single_connection

tests/test_asyncio/test_credentials.py

@@ -573,6 +573,31 @@ async def test_async_pipeline_with_credential_provider(self, r_credential: Redis
 
         assert await pipe.execute() == [True, b'value']
 
+    @pytest.mark.parametrize(
+        "r_credential",
+        [
+            {
+                "cred_provider_class": EntraIdCredentialsProvider,
+            },
+        ],
+        indirect=True,
+    )
+    @pytest.mark.asyncio
+    @pytest.mark.onlynoncluster
+    @pytest.mark.cp_integration
+    async def test_async_auth_pubsub_with_credential_provider(self, r_credential: Redis):
+        p = r_credential.pubsub()
+        await p.subscribe("entraid")
+
+        await r_credential.publish('entraid', 'test')
+        await r_credential.publish('entraid', 'test')
+
+        msg1 = await p.get_message()
+        msg2 = await p.get_message()
+
+        assert msg1['type'] == 'subscribe'
+        assert msg2['type'] == 'message'
+
 
 
 @pytest.mark.asyncio

tests/test_credentials.py

@@ -546,6 +546,27 @@ def test_auth_pipeline_with_credential_provider(self, r: redis.Redis):
 
         assert pipe.execute() == [True, b'value']
 
+    @pytest.mark.parametrize(
+        "r",
+        [
+            {
+                "cred_provider_class": EntraIdCredentialsProvider,
+            },
+        ],
+        indirect=True,
+    )
+    @pytest.mark.onlynoncluster
+    @pytest.mark.cp_integration
+    def test_auth_pubsub_with_credential_provider(self, r: redis.Redis):
+        p = r.pubsub()
+        p.subscribe("entraid")
+
+        r.publish('entraid', 'test')
+        r.publish('entraid', 'test')
+
+        assert p.get_message()['type'] == 'subscribe'
+        assert p.get_message()['type'] == 'message'
+
 
 @pytest.mark.onlycluster
 @pytest.mark.cp_integration