summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini28
1 files changed, 15 insertions, 13 deletions
diff --git a/tox.ini b/tox.ini
index bfe937f..7805296 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,7 @@
[pytest]
addopts = -s
+markers =
+ json: run only the redisjson module tests
[tox]
minversion = 3.2.0
@@ -8,63 +10,63 @@ envlist = {py35,py36,py37,py38,py39,pypy3}-{plain,hiredis}, flake8
[docker:master]
name = master
-image = redis:6.2-bullseye
+image = redisfab/redis-py:6.2.6-buster
ports =
6379:6379/tcp
healtcheck_cmd = python -c "import socket;print(True) if 0 == socket.socket(socket.AF_INET, socket.SOCK_STREAM).connect_ex(('127.0.0.1',6379)) else False"
volumes =
- bind:rw:{toxinidir}/docker/master/redis.conf:/usr/local/etc/redis/redis.conf
+ bind:rw:{toxinidir}/docker/master/redis.conf:/redis.conf
[docker:replica]
name = replica
-image = redis:6.2-bullseye
+image = redisfab/redis-py:6.2.6-buster
links =
master:master
ports =
6380:6380/tcp
healtcheck_cmd = python -c "import socket;print(True) if 0 == socket.socket(socket.AF_INET, socket.SOCK_STREAM).connect_ex(('127.0.0.1',6380)) else False"
volumes =
- bind:rw:{toxinidir}/docker/replica/redis.conf:/usr/local/etc/redis/redis.conf
+ bind:rw:{toxinidir}/docker/replica/redis.conf:/redis.conf
[docker:sentinel_1]
name = sentinel_1
-image = redis:6.2-bullseye
+image = redisfab/redis-py-sentinel:6.2.6-buster
links =
master:master
ports =
26379:26379/tcp
healtcheck_cmd = python -c "import socket;print(True) if 0 == socket.socket(socket.AF_INET, socket.SOCK_STREAM).connect_ex(('127.0.0.1',26379)) else False"
volumes =
- bind:rw:{toxinidir}/docker/sentinel_1/sentinel.conf:/usr/local/etc/redis/sentinel.conf
+ bind:rw:{toxinidir}/docker/sentinel_1/sentinel.conf:/sentinel.conf
[docker:sentinel_2]
name = sentinel_2
-image = redis:6.2-bullseye
+image = redisfab/redis-py-sentinel:6.2.6-buster
links =
master:master
ports =
26380:26380/tcp
healtcheck_cmd = python -c "import socket;print(True) if 0 == socket.socket(socket.AF_INET, socket.SOCK_STREAM).connect_ex(('127.0.0.1',26380)) else False"
volumes =
- bind:rw:{toxinidir}/docker/sentinel_2/sentinel.conf:/usr/local/etc/redis/sentinel.conf
+ bind:rw:{toxinidir}/docker/sentinel_2/sentinel.conf:/sentinel.conf
[docker:sentinel_3]
name = sentinel_3
-image = redis:6.2-bullseye
+image = redisfab/redis-py-sentinel:6.2.6-buster
links =
master:master
ports =
26381:26381/tcp
healtcheck_cmd = python -c "import socket;print(True) if 0 == socket.socket(socket.AF_INET, socket.SOCK_STREAM).connect_ex(('127.0.0.1',26381)) else False"
volumes =
- bind:rw:{toxinidir}/docker/sentinel_3/sentinel.conf:/usr/local/etc/redis/sentinel.conf
+ bind:rw:{toxinidir}/docker/sentinel_3/sentinel.conf:/sentinel.conf
[docker:redismod]
name = redismod
image = redislabs/redismod:edge
ports =
- 16379:16379/tcp
-healtcheck_cmd = python -c "import socket;print(True) if 0 == socket.socket(socket.AF_INET, socket.SOCK_STREAM).connect_ex(('127.0.0.1',16379)) else False"
+ 36379:6379/tcp
+healtcheck_cmd = python -c "import socket;print(True) if 0 == socket.socket(socket.AF_INET, socket.SOCK_STREAM).connect_ex(('127.0.0.1',36379)) else False"
[docker:lots-of-pythons]
name = lots-of-pythons
@@ -98,7 +100,7 @@ docker =
sentinel_3
redismod
lots-of-pythons
-commands = echo
+commands = /usr/bin/echo
[testenv:flake8]
deps_files = dev_requirements.txt