diff --git a/tests/testing_support/db_settings.py b/tests/testing_support/db_settings.py index 8b9af3059..4de2cb661 100644 --- a/tests/testing_support/db_settings.py +++ b/tests/testing_support/db_settings.py @@ -147,6 +147,7 @@ def redis_cluster_settings(): ] return settings + def valkey_settings(): """Return a list of dict of settings for connecting to valkey. @@ -170,31 +171,6 @@ def valkey_settings(): return settings -def valkey_cluster_settings(): - """Return a list of dict of settings for connecting to valkey cluster. - - Will return the correct settings, depending on which of the environments it - is running in. It attempts to set variables in the following order, where - later environments override earlier ones. - - 1. Local - 2. Github Actions - """ - - host = "host.docker.internal" if "GITHUB_ACTIONS" in os.environ else "localhost" - instances = 1 - base_port = 6379 - - settings = [ - { - "host": host, - "port": base_port + instance_num, - } - for instance_num in range(instances) - ] - return settings - - def memcached_settings(): """Return a list of dict of settings for connecting to memcached. @@ -233,7 +209,11 @@ def mongodb_settings(): host = "host.docker.internal" if "GITHUB_ACTIONS" in os.environ else "127.0.0.1" instances = 2 settings = [ - {"host": host, "port": 8080 + instance_num, "collection": f"mongodb_collection_{str(os.getpid())}"} + { + "host": host, + "port": 8080 + instance_num, + "collection": f"mongodb_collection_{str(os.getpid())}", + } for instance_num in range(instances) ] return settings @@ -254,7 +234,9 @@ def firestore_settings(): host = "host.docker.internal" if "GITHUB_ACTIONS" in os.environ else "127.0.0.1" instances = 2 - settings = [{"host": host, "port": 8080 + instance_num} for instance_num in range(instances)] + settings = [ + {"host": host, "port": 8080 + instance_num} for instance_num in range(instances) + ] return settings diff --git a/tox.ini b/tox.ini index 6021c3193..df3f937c4 100644 --- a/tox.ini +++ b/tox.ini @@ -177,7 +177,6 @@ envlist = redis-datastore_redis-{py37,py38,py39,py310,py311,py312,py313,pypy310}-redislatest, rediscluster-datastore_rediscluster-{py37,py312,py313,pypy310}-redislatest, valkey-datastore_valkey-{py38,py39,py310,py311,py312,py313,pypy310}-valkeylatest, - valkeycluster-datastore_valkeycluster-{py38,py313,pypy310}-valkeylatest, solr-datastore_pysolr-{py37,py38,py39,py310,py311,py312,py313,pypy310}, [testenv] @@ -288,7 +287,6 @@ deps = datastore_redis-redislatest: redis datastore_rediscluster-redislatest: redis datastore_valkey-valkeylatest: valkey - datastore_valkeycluster-valkeylatest: valkey external_aiobotocore-aiobotocorelatest: aiobotocore[awscli] external_aiobotocore-aiobotocorelatest: flask external_aiobotocore-aiobotocorelatest: flask-cors @@ -492,7 +490,6 @@ changedir = datastore_redis: tests/datastore_redis datastore_rediscluster: tests/datastore_rediscluster datastore_valkey: tests/datastore_valkey - datastore_valkeycluster: tests/datastore_valkeycluster datastore_sqlite: tests/datastore_sqlite external_aiobotocore: tests/external_aiobotocore external_botocore: tests/external_botocore