pyrox.dev
1diff --git a/tests/aio/test_storage.py b/tests/aio/test_storage.py
2index 43fc5b1..9aa86ed 100644
3--- a/tests/aio/test_storage.py
4+++ b/tests/aio/test_storage.py
5@@ -153,94 +153,6 @@ class TestBaseStorage:
6 marks=pytest.mark.memory,
7 id="in-memory",
8 ),
9- pytest.param(
10- "async+redis://localhost:7379",
11- {},
12- RedisStorage,
13- lf("redis_basic"),
14- marks=pytest.mark.redis,
15- id="redis",
16- ),
17- pytest.param(
18- "async+redis+unix:///tmp/limits.redis.sock",
19- {},
20- RedisStorage,
21- lf("redis_uds"),
22- marks=pytest.mark.redis,
23- id="redis-uds",
24- ),
25- pytest.param(
26- "async+redis+unix://:password/tmp/limits.redis.sock",
27- {},
28- RedisStorage,
29- lf("redis_uds"),
30- marks=pytest.mark.redis,
31- id="redis-uds-auth",
32- ),
33- pytest.param(
34- "async+memcached://localhost:22122",
35- {},
36- MemcachedStorage,
37- lf("memcached"),
38- marks=pytest.mark.memcached,
39- id="memcached",
40- ),
41- pytest.param(
42- "async+memcached://localhost:22122,localhost:22123",
43- {},
44- MemcachedStorage,
45- lf("memcached_cluster"),
46- marks=pytest.mark.memcached,
47- id="memcached-cluster",
48- ),
49- pytest.param(
50- "async+redis+sentinel://localhost:26379",
51- {"service_name": "mymaster"},
52- RedisSentinelStorage,
53- lf("redis_sentinel"),
54- marks=pytest.mark.redis_sentinel,
55- id="redis-sentinel",
56- ),
57- pytest.param(
58- "async+redis+sentinel://localhost:26379/mymaster",
59- {},
60- RedisSentinelStorage,
61- lf("redis_sentinel"),
62- marks=pytest.mark.redis_sentinel,
63- id="redis-sentinel-service-name-url",
64- ),
65- pytest.param(
66- "async+redis+sentinel://:sekret@localhost:36379/mymaster",
67- {"password": "sekret"},
68- RedisSentinelStorage,
69- lf("redis_sentinel_auth"),
70- marks=pytest.mark.redis_sentinel,
71- id="redis-sentinel-auth",
72- ),
73- pytest.param(
74- "async+redis+cluster://localhost:7001/",
75- {},
76- RedisClusterStorage,
77- lf("redis_cluster"),
78- marks=pytest.mark.redis_cluster,
79- id="redis-cluster",
80- ),
81- pytest.param(
82- "async+redis+cluster://:sekret@localhost:8400/",
83- {},
84- RedisClusterStorage,
85- lf("redis_auth_cluster"),
86- marks=pytest.mark.redis_cluster,
87- id="redis-cluster-auth",
88- ),
89- pytest.param(
90- "async+mongodb://localhost:37017/",
91- {},
92- MongoDBStorage,
93- lf("mongodb"),
94- marks=pytest.mark.mongodb,
95- id="mongodb",
96- ),
97 ],
98 )
99 class TestConcreteStorages:
100diff --git a/tests/test_storage.py b/tests/test_storage.py
101index f9698c0..2062e3a 100644
102--- a/tests/test_storage.py
103+++ b/tests/test_storage.py
104@@ -148,102 +148,6 @@ class TestBaseStorage:
105 "uri, args, expected_instance, fixture",
106 [
107 pytest.param("memory://", {}, MemoryStorage, None, id="in-memory"),
108- pytest.param(
109- "redis://localhost:7379",
110- {},
111- RedisStorage,
112- lf("redis_basic"),
113- marks=pytest.mark.redis,
114- id="redis",
115- ),
116- pytest.param(
117- "redis+unix:///tmp/limits.redis.sock",
118- {},
119- RedisStorage,
120- lf("redis_uds"),
121- marks=pytest.mark.redis,
122- id="redis-uds",
123- ),
124- pytest.param(
125- "redis+unix://:password/tmp/limits.redis.sock",
126- {},
127- RedisStorage,
128- lf("redis_uds"),
129- marks=pytest.mark.redis,
130- id="redis-uds-auth",
131- ),
132- pytest.param(
133- "memcached://localhost:22122",
134- {},
135- MemcachedStorage,
136- lf("memcached"),
137- marks=pytest.mark.memcached,
138- id="memcached",
139- ),
140- pytest.param(
141- "memcached://localhost:22122,localhost:22123",
142- {},
143- MemcachedStorage,
144- lf("memcached_cluster"),
145- marks=pytest.mark.memcached,
146- id="memcached-cluster",
147- ),
148- pytest.param(
149- "memcached:///tmp/limits.memcached.sock",
150- {},
151- MemcachedStorage,
152- lf("memcached_uds"),
153- marks=pytest.mark.memcached,
154- id="memcached-uds",
155- ),
156- pytest.param(
157- "redis+sentinel://localhost:26379",
158- {"service_name": "mymaster"},
159- RedisSentinelStorage,
160- lf("redis_sentinel"),
161- marks=pytest.mark.redis_sentinel,
162- id="redis-sentinel",
163- ),
164- pytest.param(
165- "redis+sentinel://localhost:26379/mymaster",
166- {},
167- RedisSentinelStorage,
168- lf("redis_sentinel"),
169- marks=pytest.mark.redis_sentinel,
170- id="redis-sentinel-service-name-url",
171- ),
172- pytest.param(
173- "redis+sentinel://:sekret@localhost:36379/mymaster",
174- {"password": "sekret"},
175- RedisSentinelStorage,
176- lf("redis_sentinel_auth"),
177- marks=pytest.mark.redis_sentinel,
178- id="redis-sentinel-auth",
179- ),
180- pytest.param(
181- "redis+cluster://localhost:7001/",
182- {},
183- RedisClusterStorage,
184- lf("redis_cluster"),
185- marks=pytest.mark.redis_cluster,
186- id="redis-cluster",
187- ),
188- pytest.param(
189- "redis+cluster://:sekret@localhost:8400/",
190- {},
191- RedisClusterStorage,
192- lf("redis_auth_cluster"),
193- marks=pytest.mark.redis_cluster,
194- id="redis-cluster-auth",
195- ),
196- pytest.param(
197- "mongodb://localhost:37017/",
198- {},
199- MongoDBStorage,
200- lf("mongodb"),
201- marks=pytest.mark.mongodb,
202- id="mongodb",
203- ),
204 ],
205 )
206 class TestConcreteStorages:
207diff --git a/tests/utils.py b/tests/utils.py
208index 3341bcf..6dc2bc3 100644
209--- a/tests/utils.py
210+++ b/tests/utils.py
211@@ -90,186 +90,11 @@ ALL_STORAGES = {
212 "memory": pytest.param(
213 "memory://", {}, None, marks=pytest.mark.memory, id="in-memory"
214 ),
215- "redis": pytest.param(
216- "redis://localhost:7379",
217- {},
218- lf("redis_basic"),
219- marks=pytest.mark.redis,
220- id="redis_basic",
221- ),
222- "memcached": pytest.param(
223- "memcached://localhost:22122",
224- {},
225- lf("memcached"),
226- marks=[pytest.mark.memcached, pytest.mark.flaky],
227- id="memcached",
228- ),
229- "memcached-cluster": pytest.param(
230- "memcached://localhost:22122,localhost:22123",
231- {},
232- lf("memcached_cluster"),
233- marks=[pytest.mark.memcached, pytest.mark.flaky],
234- id="memcached-cluster",
235- ),
236- "redis-cluster": pytest.param(
237- "redis+cluster://localhost:7001/",
238- {},
239- lf("redis_cluster"),
240- marks=pytest.mark.redis_cluster,
241- id="redis-cluster",
242- ),
243- "redis-cluster_auth": pytest.param(
244- "redis+cluster://:sekret@localhost:8400/",
245- {},
246- lf("redis_auth_cluster"),
247- marks=pytest.mark.redis_cluster,
248- id="redis-cluster-auth",
249- ),
250- "redis-ssl-cluster": pytest.param(
251- "redis+cluster://localhost:8301",
252- {
253- "ssl": True,
254- "ssl_cert_reqs": "required",
255- "ssl_keyfile": "./tests/tls/client.key",
256- "ssl_certfile": "./tests/tls/client.crt",
257- "ssl_ca_certs": "./tests/tls/ca.crt",
258- },
259- lf("redis_ssl_cluster"),
260- marks=pytest.mark.redis_cluster,
261- id="redis-ssl-cluster",
262- ),
263- "redis-sentinel": pytest.param(
264- "redis+sentinel://localhost:26379/mymaster",
265- {"use_replicas": False},
266- lf("redis_sentinel"),
267- marks=pytest.mark.redis_sentinel,
268- id="redis-sentinel",
269- ),
270- "mongodb": pytest.param(
271- "mongodb://localhost:37017/",
272- {},
273- lf("mongodb"),
274- marks=pytest.mark.mongodb,
275- id="mongodb",
276- ),
277- "valkey": pytest.param(
278- "valkey://localhost:12379",
279- {},
280- lf("valkey_basic"),
281- marks=pytest.mark.valkey,
282- id="valkey_basic",
283- ),
284- "valkey-cluster": pytest.param(
285- "valkey+cluster://localhost:2001/",
286- {},
287- lf("valkey_cluster"),
288- marks=pytest.mark.valkey_cluster,
289- id="valkey-cluster",
290- ),
291 }
292 ALL_STORAGES_ASYNC = {
293 "memory": pytest.param(
294 "async+memory://", {}, None, marks=pytest.mark.memory, id="in-memory"
295 ),
296- "redis": pytest.param(
297- "async+redis://localhost:7379",
298- {
299- "implementation": ASYNC_REDIS_IMPLEMENTATION,
300- },
301- lf("redis_basic"),
302- marks=pytest.mark.redis,
303- id="redis",
304- ),
305- "memcached": pytest.param(
306- "async+memcached://localhost:22122",
307- {
308- "implementation": ASYNC_MEMCACHED_IMPLEMENTATION,
309- },
310- lf("memcached"),
311- marks=[pytest.mark.memcached, pytest.mark.flaky],
312- id="memcached",
313- ),
314- "memcached-cluster": pytest.param(
315- "async+memcached://localhost:22122,localhost:22123",
316- {
317- "implementation": ASYNC_MEMCACHED_IMPLEMENTATION,
318- },
319- lf("memcached_cluster"),
320- marks=[pytest.mark.memcached, pytest.mark.flaky],
321- id="memcached-cluster",
322- ),
323- "memcached-sasl": pytest.param(
324- "async+memcached://user:password@localhost:22124",
325- {
326- "implementation": ASYNC_MEMCACHED_IMPLEMENTATION,
327- },
328- lf("memcached_sasl"),
329- marks=[pytest.mark.memcached, pytest.mark.flaky],
330- id="memcached-sasl",
331- ),
332- "redis-cluster": pytest.param(
333- "async+redis+cluster://localhost:7001/",
334- {
335- "implementation": ASYNC_REDIS_IMPLEMENTATION,
336- },
337- lf("redis_cluster"),
338- marks=pytest.mark.redis_cluster,
339- id="redis-cluster",
340- ),
341- "redis-cluster-auth": pytest.param(
342- "async+redis+cluster://:sekret@localhost:8400/",
343- {
344- "implementation": ASYNC_REDIS_IMPLEMENTATION,
345- },
346- lf("redis_auth_cluster"),
347- marks=pytest.mark.redis_cluster,
348- id="redis-cluster-auth",
349- ),
350- "redis-ssl-cluster": pytest.param(
351- "async+redis+cluster://localhost:8301",
352- {
353- "ssl": True,
354- "ssl_cert_reqs": "required",
355- "ssl_keyfile": "./tests/tls/client.key",
356- "ssl_certfile": "./tests/tls/client.crt",
357- "ssl_ca_certs": "./tests/tls/ca.crt",
358- "implementation": ASYNC_REDIS_IMPLEMENTATION,
359- },
360- lf("redis_ssl_cluster"),
361- marks=pytest.mark.redis_cluster,
362- id="redis-ssl-cluster",
363- ),
364- "redis-sentinel": pytest.param(
365- "async+redis+sentinel://localhost:26379/mymaster",
366- {
367- "use_replicas": False,
368- "implementation": ASYNC_REDIS_IMPLEMENTATION,
369- },
370- lf("redis_sentinel"),
371- marks=pytest.mark.redis_sentinel,
372- id="redis-sentinel",
373- ),
374- "mongodb": pytest.param(
375- "async+mongodb://localhost:37017/",
376- {},
377- lf("mongodb"),
378- marks=pytest.mark.mongodb,
379- id="mongodb",
380- ),
381- "valkey": pytest.param(
382- "async+valkey://localhost:12379",
383- {},
384- lf("valkey_basic"),
385- marks=pytest.mark.valkey,
386- id="valkey_basic",
387- ),
388- "valkey-cluster": pytest.param(
389- "async+valkey+cluster://localhost:2001/",
390- {},
391- lf("valkey_cluster"),
392- marks=pytest.mark.valkey_cluster,
393- id="valkey-cluster",
394- ),
395 }
396
397 all_storage = pytest.mark.parametrize("uri, args, fixture", ALL_STORAGES.values())