1 diff --git a/tests/aio/test_storage.py b/tests/aio/test_storage.py
2 index 1040d18..deecd9b 100644
3 --- a/tests/aio/test_storage.py
4 +++ b/tests/aio/test_storage.py
5 @@ -95,102 +95,6 @@ class TestBaseStorage:
6 "uri, args, expected_instance, fixture",
8 pytest.param("async+memory://", {}, MemoryStorage, None, id="in-memory"),
10 - "async+redis://localhost:7379",
13 - pytest.lazy_fixture("redis_basic"),
14 - marks=pytest.mark.redis,
18 - "async+redis+unix:///tmp/limits.redis.sock",
21 - pytest.lazy_fixture("redis_uds"),
22 - marks=pytest.mark.redis,
26 - "async+redis+unix://:password/tmp/limits.redis.sock",
29 - pytest.lazy_fixture("redis_uds"),
30 - marks=pytest.mark.redis,
31 - id="redis-uds-auth",
34 - "async+memcached://localhost:22122",
37 - pytest.lazy_fixture("memcached"),
38 - marks=pytest.mark.memcached,
42 - "async+memcached://localhost:22122,localhost:22123",
45 - pytest.lazy_fixture("memcached_cluster"),
46 - marks=pytest.mark.memcached,
47 - id="memcached-cluster",
50 - "async+redis+sentinel://localhost:26379",
51 - {"service_name": "mymaster"},
52 - RedisSentinelStorage,
53 - pytest.lazy_fixture("redis_sentinel"),
54 - marks=pytest.mark.redis_sentinel,
55 - id="redis-sentinel",
58 - "async+redis+sentinel://localhost:26379/mymaster",
60 - RedisSentinelStorage,
61 - pytest.lazy_fixture("redis_sentinel"),
62 - marks=pytest.mark.redis_sentinel,
63 - id="redis-sentinel-service-name-url",
66 - "async+redis+sentinel://:sekret@localhost:36379/mymaster",
67 - {"password": "sekret"},
68 - RedisSentinelStorage,
69 - pytest.lazy_fixture("redis_sentinel_auth"),
70 - marks=pytest.mark.redis_sentinel,
71 - id="redis-sentinel-auth",
74 - "async+redis+cluster://localhost:7001/",
76 - RedisClusterStorage,
77 - pytest.lazy_fixture("redis_cluster"),
78 - marks=pytest.mark.redis_cluster,
82 - "async+redis+cluster://:sekret@localhost:8400/",
84 - RedisClusterStorage,
85 - pytest.lazy_fixture("redis_auth_cluster"),
86 - marks=pytest.mark.redis_cluster,
87 - id="redis-cluster-auth",
90 - "async+mongodb://localhost:37017/",
93 - pytest.lazy_fixture("mongodb"),
94 - marks=pytest.mark.mongodb,
98 - "async+etcd://localhost:2379",
101 - pytest.lazy_fixture("etcd"),
102 - marks=pytest.mark.etcd,
107 class TestConcreteStorages:
108 diff --git a/tests/test_storage.py b/tests/test_storage.py
109 index 1b8c7b0..97dcee5 100644
110 --- a/tests/test_storage.py
111 +++ b/tests/test_storage.py
112 @@ -100,110 +100,6 @@ class TestBaseStorage:
113 "uri, args, expected_instance, fixture",
115 pytest.param("memory://", {}, MemoryStorage, None, id="in-memory"),
117 - "redis://localhost:7379",
120 - pytest.lazy_fixture("redis_basic"),
121 - marks=pytest.mark.redis,
125 - "redis+unix:///tmp/limits.redis.sock",
128 - pytest.lazy_fixture("redis_uds"),
129 - marks=pytest.mark.redis,
133 - "redis+unix://:password/tmp/limits.redis.sock",
136 - pytest.lazy_fixture("redis_uds"),
137 - marks=pytest.mark.redis,
138 - id="redis-uds-auth",
141 - "memcached://localhost:22122",
144 - pytest.lazy_fixture("memcached"),
145 - marks=pytest.mark.memcached,
149 - "memcached://localhost:22122,localhost:22123",
152 - pytest.lazy_fixture("memcached_cluster"),
153 - marks=pytest.mark.memcached,
154 - id="memcached-cluster",
157 - "memcached:///tmp/limits.memcached.sock",
160 - pytest.lazy_fixture("memcached_uds"),
161 - marks=pytest.mark.memcached,
162 - id="memcached-uds",
165 - "redis+sentinel://localhost:26379",
166 - {"service_name": "mymaster"},
167 - RedisSentinelStorage,
168 - pytest.lazy_fixture("redis_sentinel"),
169 - marks=pytest.mark.redis_sentinel,
170 - id="redis-sentinel",
173 - "redis+sentinel://localhost:26379/mymaster",
175 - RedisSentinelStorage,
176 - pytest.lazy_fixture("redis_sentinel"),
177 - marks=pytest.mark.redis_sentinel,
178 - id="redis-sentinel-service-name-url",
181 - "redis+sentinel://:sekret@localhost:36379/mymaster",
182 - {"password": "sekret"},
183 - RedisSentinelStorage,
184 - pytest.lazy_fixture("redis_sentinel_auth"),
185 - marks=pytest.mark.redis_sentinel,
186 - id="redis-sentinel-auth",
189 - "redis+cluster://localhost:7001/",
191 - RedisClusterStorage,
192 - pytest.lazy_fixture("redis_cluster"),
193 - marks=pytest.mark.redis_cluster,
194 - id="redis-cluster",
197 - "redis+cluster://:sekret@localhost:8400/",
199 - RedisClusterStorage,
200 - pytest.lazy_fixture("redis_auth_cluster"),
201 - marks=pytest.mark.redis_cluster,
202 - id="redis-cluster-auth",
205 - "mongodb://localhost:37017/",
208 - pytest.lazy_fixture("mongodb"),
209 - marks=pytest.mark.mongodb,
213 - "etcd://localhost:2379",
216 - pytest.lazy_fixture("etcd"),
217 - marks=pytest.mark.etcd,
222 class TestConcreteStorages:
223 diff --git a/tests/utils.py b/tests/utils.py
224 index 558d766..9dcb911 100644
227 @@ -52,75 +52,6 @@ all_storage = pytest.mark.parametrize(
228 "uri, args, fixture",
230 pytest.param("memory://", {}, None, id="in-memory"),
232 - "redis://localhost:7379",
234 - pytest.lazy_fixture("redis_basic"),
235 - marks=pytest.mark.redis,
239 - "memcached://localhost:22122",
241 - pytest.lazy_fixture("memcached"),
242 - marks=[pytest.mark.memcached, pytest.mark.flaky],
246 - "memcached://localhost:22122,localhost:22123",
248 - pytest.lazy_fixture("memcached_cluster"),
249 - marks=[pytest.mark.memcached, pytest.mark.flaky],
250 - id="memcached-cluster",
253 - "redis+cluster://localhost:7001/",
255 - pytest.lazy_fixture("redis_cluster"),
256 - marks=pytest.mark.redis_cluster,
257 - id="redis-cluster",
260 - "redis+cluster://:sekret@localhost:8400/",
262 - pytest.lazy_fixture("redis_auth_cluster"),
263 - marks=pytest.mark.redis_cluster,
264 - id="redis-cluster-auth",
267 - "redis+cluster://localhost:8301",
270 - "ssl_cert_reqs": "required",
271 - "ssl_keyfile": "./tests/tls/client.key",
272 - "ssl_certfile": "./tests/tls/client.crt",
273 - "ssl_ca_certs": "./tests/tls/ca.crt",
275 - pytest.lazy_fixture("redis_ssl_cluster"),
276 - marks=pytest.mark.redis_cluster,
277 - id="redis-ssl-cluster",
280 - "redis+sentinel://localhost:26379/mymaster",
281 - {"use_replicas": False},
282 - pytest.lazy_fixture("redis_sentinel"),
283 - marks=pytest.mark.redis_sentinel,
284 - id="redis-sentinel",
287 - "mongodb://localhost:37017/",
289 - pytest.lazy_fixture("mongodb"),
290 - marks=pytest.mark.mongodb,
294 - "etcd://localhost:2379",
296 - pytest.lazy_fixture("etcd"),
297 - marks=[pytest.mark.etcd, pytest.mark.flaky],
303 @@ -128,54 +59,6 @@ moving_window_storage = pytest.mark.parametrize(
304 "uri, args, fixture",
306 pytest.param("memory://", {}, None, id="in-memory"),
308 - "redis://localhost:7379",
310 - pytest.lazy_fixture("redis_basic"),
311 - marks=pytest.mark.redis,
315 - "redis+cluster://localhost:7001/",
317 - pytest.lazy_fixture("redis_cluster"),
318 - marks=pytest.mark.redis_cluster,
319 - id="redis-cluster",
322 - "redis+cluster://:sekret@localhost:8400/",
324 - pytest.lazy_fixture("redis_auth_cluster"),
325 - marks=pytest.mark.redis_cluster,
326 - id="redis-cluster-auth",
329 - "redis+cluster://localhost:8301",
332 - "ssl_cert_reqs": "required",
333 - "ssl_keyfile": "./tests/tls/client.key",
334 - "ssl_certfile": "./tests/tls/client.crt",
335 - "ssl_ca_certs": "./tests/tls/ca.crt",
337 - pytest.lazy_fixture("redis_ssl_cluster"),
338 - marks=pytest.mark.redis_cluster,
339 - id="redis-ssl-cluster",
342 - "redis+sentinel://localhost:26379/mymaster",
343 - {"use_replicas": False},
344 - pytest.lazy_fixture("redis_sentinel"),
345 - marks=pytest.mark.redis_sentinel,
346 - id="redis-sentinel",
349 - "mongodb://localhost:37017/",
351 - pytest.lazy_fixture("mongodb"),
352 - marks=pytest.mark.mongodb,
358 @@ -183,75 +66,6 @@ async_all_storage = pytest.mark.parametrize(
359 "uri, args, fixture",
361 pytest.param("async+memory://", {}, None, id="in-memory"),
363 - "async+redis://localhost:7379",
365 - pytest.lazy_fixture("redis_basic"),
366 - marks=pytest.mark.redis,
370 - "async+memcached://localhost:22122",
372 - pytest.lazy_fixture("memcached"),
373 - marks=[pytest.mark.memcached, pytest.mark.flaky],
377 - "async+memcached://localhost:22122,localhost:22123",
379 - pytest.lazy_fixture("memcached_cluster"),
380 - marks=[pytest.mark.memcached, pytest.mark.flaky],
381 - id="memcached-cluster",
384 - "async+redis+cluster://localhost:7001/",
386 - pytest.lazy_fixture("redis_cluster"),
387 - marks=pytest.mark.redis_cluster,
388 - id="redis-cluster",
391 - "async+redis+cluster://:sekret@localhost:8400/",
393 - pytest.lazy_fixture("redis_auth_cluster"),
394 - marks=pytest.mark.redis_cluster,
395 - id="redis-cluster-auth",
398 - "async+redis+cluster://localhost:8301",
401 - "ssl_cert_reqs": "required",
402 - "ssl_keyfile": "./tests/tls/client.key",
403 - "ssl_certfile": "./tests/tls/client.crt",
404 - "ssl_ca_certs": "./tests/tls/ca.crt",
406 - pytest.lazy_fixture("redis_ssl_cluster"),
407 - marks=pytest.mark.redis_cluster,
408 - id="redis-ssl-cluster",
411 - "async+redis+sentinel://localhost:26379/mymaster",
412 - {"use_replicas": False},
413 - pytest.lazy_fixture("redis_sentinel"),
414 - marks=pytest.mark.redis_sentinel,
415 - id="redis-sentinel",
418 - "async+mongodb://localhost:37017/",
420 - pytest.lazy_fixture("mongodb"),
421 - marks=pytest.mark.mongodb,
425 - "async+etcd://localhost:2379",
427 - pytest.lazy_fixture("etcd"),
428 - marks=[pytest.mark.etcd, pytest.mark.flaky],
434 @@ -259,53 +73,5 @@ async_moving_window_storage = pytest.mark.parametrize(
435 "uri, args, fixture",
437 pytest.param("async+memory://", {}, None, id="in-memory"),
439 - "async+redis://localhost:7379",
441 - pytest.lazy_fixture("redis_basic"),
442 - marks=pytest.mark.redis,
446 - "async+redis+cluster://localhost:7001/",
448 - pytest.lazy_fixture("redis_cluster"),
449 - marks=pytest.mark.redis_cluster,
450 - id="redis-cluster",
453 - "async+redis+cluster://:sekret@localhost:8400/",
455 - pytest.lazy_fixture("redis_auth_cluster"),
456 - marks=pytest.mark.redis_cluster,
457 - id="redis-cluster-auth",
460 - "async+redis+cluster://localhost:8301",
463 - "ssl_cert_reqs": "required",
464 - "ssl_keyfile": "./tests/tls/client.key",
465 - "ssl_certfile": "./tests/tls/client.crt",
466 - "ssl_ca_certs": "./tests/tls/ca.crt",
468 - pytest.lazy_fixture("redis_ssl_cluster"),
469 - marks=pytest.mark.redis_cluster,
470 - id="redis-ssl-cluster",
473 - "async+redis+sentinel://localhost:26379/mymaster",
474 - {"use_replicas": False},
475 - pytest.lazy_fixture("redis_sentinel"),
476 - marks=pytest.mark.redis_sentinel,
477 - id="redis-sentinel",
480 - "async+mongodb://localhost:37017/",
482 - pytest.lazy_fixture("mongodb"),
483 - marks=pytest.mark.mongodb,