Fixup: convert to new CI

newrelic · Jul 14, 2023 · 35b5e6c · 35b5e6c
1 parent fcd7d17
commit 35b5e6c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/newrelic/config.py b/newrelic/config.py
@@ -2853,10 +2853,6 @@ def _process_module_builtin_defaults():
         "redis.commands.cluster", "newrelic.hooks.datastore_redis", "instrument_redis_commands_cluster"
     )
 
-    _process_module_definition(
-        "redis.commands.cluster", "newrelic.hooks.datastore_redis", "instrument_redis_commands_cluster"
-    )
-
     _process_module_definition(
         "redis.commands.core", "newrelic.hooks.datastore_redis", "instrument_redis_commands_core"
     )

diff --git a/tests/testing_support/db_settings.py b/tests/testing_support/db_settings.py
@@ -132,12 +132,9 @@ def redis_cluster_settings():
         2. Github Actions
     """
 
-    if "GITHUB_ACTIONS" in os.environ:
-        instances = 1
-        base_port = 8090
-    else:
-        instances = 1
-        base_port = 7000
+    host = "host.docker.internal" if "GITHUB_ACTIONS" in os.environ else "localhost"
+    instances = 1
+    base_port = 7000
 
     settings = [
         {

diff --git a/tox.ini b/tox.ini
@@ -459,8 +459,8 @@ changedir =
     datastore_pymssql: tests/datastore_pymssql
     datastore_pymysql: tests/datastore_pymysql
     datastore_pysolr: tests/datastore_pysolr
-    datastore_redis: tests/datastore_redis/
-    datastore_rediscluster: tests/datastore_rediscluster/
+    datastore_redis: tests/datastore_redis
+    datastore_rediscluster: tests/datastore_rediscluster
     datastore_aioredis: tests/datastore_aioredis
     datastore_aredis: tests/datastore_aredis
     datastore_solrpy: tests/datastore_solrpy