Dockerize

.gitignore

@@ -11,3 +11,5 @@ vagrant/.vagrant
 .eggs
 .idea
 .coverage
+env
+venv

Makefile

@@ -0,0 +1,13 @@
+.PHONY: base
+
+build:
+	docker build -t redis-py-base docker/base
+	docker-compose down
+	docker-compose build
+
+dev:
+	docker-compose up -d
+
+test: dev
+	find . -name "*.pyc" -exec rm -f {} \;
+	docker-compose run test tox -- --redis-url="redis://master:6379/9" --redis-master-host=master

docker-compose.yml

@@ -0,0 +1,33 @@
+version: "3.8"
+
+services:
+  master:
+    build: docker/master
+    ports:
+      - "6379:6379"
+
+  slave:
+    build: docker/slave
+    ports:
+      - "6380:6380"
+
+  sentinel_1:
+    build: docker/sentinel_1
+    ports:
+      - "26379:26379"
+
+  sentinel_2:
+    build: docker/sentinel_2
+    ports:
+      - "26380:26380"
+
+  sentinel_3:
+    build: docker/sentinel_3
+    ports:
+      - "26381:26381"
+
+  test:
+    image: fkrull/multi-python:latest
+    working_dir: /redis-py
+    volumes:
+      - .:/redis-py

docker/base/Dockerfile

@@ -0,0 +1 @@
+FROM redis:6.0.5-buster

docker/master/Dockerfile

@@ -0,0 +1,7 @@
+FROM redis-py-base:latest
+
+COPY redis.conf /etc/conf/redis/redis.conf
+
+EXPOSE 6379
+
+CMD redis-server

docker/master/redis.conf

@@ -0,0 +1,9 @@
+pidfile /var/run/redis-master.pid
+bind *
+port 6379
+daemonize yes
+unixsocket /tmp/redis_master.sock
+unixsocketperm 777
+dbfilename master.rdb
+dir /var/lib/redis/backups
+logfile /var/log/redis-master

docker/sentinel_1/Dockerfile

@@ -0,0 +1,7 @@
+FROM redis-py-base:latest
+
+COPY redis.conf /etc/conf/redis/redis.conf
+
+EXPOSE 26379
+
+CMD redis-server

docker/sentinel_1/redis.conf

@@ -0,0 +1,7 @@
+pidfile /var/run/sentinel-1.pid
+port 26379
+daemonize yes
+logfile /var/log/redis-sentinel-1
+
+# short timeout for sentinel tests
+sentinel down-after-milliseconds mymaster 500

docker/sentinel_2/Dockerfile

@@ -0,0 +1,7 @@
+FROM redis-py-base:latest
+
+COPY redis.conf /etc/conf/redis/redis.conf
+
+EXPOSE 26380
+
+CMD redis-server

docker/sentinel_2/redis.conf

@@ -0,0 +1,7 @@
+pidfile /var/run/sentinel-2.pid
+port 26380
+daemonize yes
+logfile /var/log/redis-sentinel-2
+
+# short timeout for sentinel tests
+sentinel down-after-milliseconds mymaster 500

docker/sentinel_3/Dockerfile

@@ -0,0 +1,7 @@
+FROM redis-py-base:latest
+
+COPY redis.conf /etc/conf/redis/redis.conf
+
+EXPOSE 26381
+
+CMD redis-server

docker/sentinel_3/redis.conf

@@ -0,0 +1,7 @@
+pidfile /var/run/sentinel-3.pid
+port 26381
+daemonize yes
+logfile /var/log/redis-sentinel-3
+
+# short timeout for sentinel tests
+sentinel down-after-milliseconds mymaster 500

docker/slave/Dockerfile

@@ -0,0 +1,7 @@
+FROM redis-py-base:latest
+
+COPY redis.conf /etc/conf/redis/redis.conf
+
+EXPOSE 6380
+
+CMD redis-server

docker/slave/redis.conf

@@ -0,0 +1,11 @@
+pidfile /var/run/redis-slave.pid
+bind *
+port 6380
+daemonize yes
+unixsocket /tmp/redis-slave.sock
+unixsocketperm 777
+dbfilename slave.rdb
+dir /var/lib/redis/backups
+logfile /var/log/redis-slave
+
+slaveof 127.0.0.1 6379

setup.cfg

@@ -36,7 +36,7 @@ python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
 hiredis = hiredis>=0.1.3
 
 [flake8]
-exclude = .venv,.tox,dist,docs,build,*.egg,redis_install
+exclude = .venv,.tox,dist,docs,build,*.egg,redis_install,env,venv
 
 [bdist_wheel]
 universal = 1

tests/conftest.py

@@ -14,14 +14,21 @@
 
 
 REDIS_INFO = {}
-default_redis_url = "redis://localhost:6379/9"
+DEFAULT_REDIS_URL = "redis://localhost:6379/9"
+DEFAULT_REDIS_MASTER_HOST = "localhost"
+
 
 
 def pytest_addoption(parser):
-    parser.addoption('--redis-url', default=default_redis_url,
+    parser.addoption('--redis-url', default=DEFAULT_REDIS_URL,
                      action="store",
                      help="Redis connection string,"
                           " defaults to `%(default)s`")
+    parser.addoption('--redis-master-host', default=DEFAULT_REDIS_MASTER_HOST,
+                     action="store",
+                     help="Redis master hostname,"
+                          " defaults to `%(default)s`")
+
 
 
 def _get_info(redis_url):
@@ -156,6 +163,11 @@ def mock_cluster_resp_slaves(request, **kwargs):
     return _gen_cluster_mock_resp(r, response)
 
 
+@pytest.fixture(scope="module")
+def master_host(request):
+    yield request.config.getoption("--redis-master-host")
+
+
 def wait_for_command(client, monitor, command):
     # issue a command with a key name that's local to this process.
     # if we find a command with our key before the command we're waiting

tests/test_connection_pool.py

@@ -43,21 +43,25 @@ def test_connection_creation(self):
         assert isinstance(connection, DummyConnection)
         assert connection.kwargs == connection_kwargs
 
-    def test_multiple_connections(self):
-        pool = self.get_pool()
+    def test_multiple_connections(self, master_host):
+        connection_kwargs = {'host': master_host}
+        pool = self.get_pool(connection_kwargs=connection_kwargs)
         c1 = pool.get_connection('_')
         c2 = pool.get_connection('_')
         assert c1 != c2
 
-    def test_max_connections(self):
-        pool = self.get_pool(max_connections=2)
+    def test_max_connections(self, master_host):
+        connection_kwargs = {'host': master_host}
+        pool = self.get_pool(max_connections=2,
+                             connection_kwargs=connection_kwargs)
         pool.get_connection('_')
         pool.get_connection('_')
         with pytest.raises(redis.ConnectionError):
             pool.get_connection('_')
 
-    def test_reuse_previously_released_connection(self):
-        pool = self.get_pool()
+    def test_reuse_previously_released_connection(self, master_host):
+        connection_kwargs = {'host': master_host}
+        pool = self.get_pool(connection_kwargs=connection_kwargs)
         c1 = pool.get_connection('_')
         pool.release(c1)
         c2 = pool.get_connection('_')
@@ -98,22 +102,25 @@ def get_pool(self, connection_kwargs=None, max_connections=10, timeout=20):
                                             **connection_kwargs)
         return pool
 
-    def test_connection_creation(self):
-        connection_kwargs = {'foo': 'bar', 'biz': 'baz'}
+    def test_connection_creation(self, master_host):
+        connection_kwargs = {'foo': 'bar', 'biz': 'baz', 'host': master_host}
         pool = self.get_pool(connection_kwargs=connection_kwargs)
         connection = pool.get_connection('_')
         assert isinstance(connection, DummyConnection)
         assert connection.kwargs == connection_kwargs
 
-    def test_multiple_connections(self):
-        pool = self.get_pool()
+    def test_multiple_connections(self, master_host):
+        connection_kwargs = {'host': master_host}
+        pool = self.get_pool(connection_kwargs=connection_kwargs)
         c1 = pool.get_connection('_')
         c2 = pool.get_connection('_')
         assert c1 != c2
 
-    def test_connection_pool_blocks_until_timeout(self):
+    def test_connection_pool_blocks_until_timeout(self, master_host):
         "When out of connections, block for timeout seconds, then raise"
-        pool = self.get_pool(max_connections=1, timeout=0.1)
+        connection_kwargs = {'host': master_host}
+        pool = self.get_pool(max_connections=1, timeout=0.1,
+                             connection_kwargs=connection_kwargs)
         pool.get_connection('_')
 
         start = time.time()
@@ -122,12 +129,14 @@ def test_connection_pool_blocks_until_timeout(self):
         # we should have waited at least 0.1 seconds
         assert time.time() - start >= 0.1
 
-    def connection_pool_blocks_until_another_connection_released(self):
+    def test_connection_pool_blocks_until_another_connection_released(self, master_host):
         """
         When out of connections, block until another connection is released
         to the pool
         """
-        pool = self.get_pool(max_connections=1, timeout=2)
+        connection_kwargs = {'host': master_host}
+        pool = self.get_pool(max_connections=1, timeout=2,
+                             connection_kwargs=connection_kwargs)
         c1 = pool.get_connection('_')
 
         def target():
@@ -139,8 +148,9 @@ def target():
         pool.get_connection('_')
         assert time.time() - start >= 0.1
 
-    def test_reuse_previously_released_connection(self):
-        pool = self.get_pool()
+    def test_reuse_previously_released_connection(self, master_host):
+        connection_kwargs = {'host': master_host}
+        pool = self.get_pool(connection_kwargs=connection_kwargs)
         c1 = pool.get_connection('_')
         pool.release(c1)
         c2 = pool.get_connection('_')

tests/test_multiprocessing.py

@@ -30,12 +30,12 @@ def r(self, request):
             request=request,
             single_connection_client=False)
 
-    def test_close_connection_in_child(self):
+    def test_close_connection_in_child(self, master_host):
         """
         A connection owned by a parent and closed by a child doesn't
         destroy the file descriptors so a parent can still use it.
         """
-        conn = Connection()
+        conn = Connection(host=master_host)
         conn.send_command('ping')
         assert conn.read_response() == b'PONG'
 
@@ -56,12 +56,12 @@ def target(conn):
         conn.send_command('ping')
         assert conn.read_response() == b'PONG'
 
-    def test_close_connection_in_parent(self):
+    def test_close_connection_in_parent(self, master_host):
         """
         A connection owned by a parent is unusable by a child if the parent
         (the owning process) closes the connection.
         """
-        conn = Connection()
+        conn = Connection(host=master_host)
         conn.send_command('ping')
         assert conn.read_response() == b'PONG'
 
@@ -84,12 +84,12 @@ def target(conn, ev):
         assert proc.exitcode == 0
 
     @pytest.mark.parametrize('max_connections', [1, 2, None])
-    def test_pool(self, max_connections):
+    def test_pool(self, max_connections, master_host):
         """
         A child will create its own connections when using a pool created
         by a parent.
         """
-        pool = ConnectionPool.from_url('redis://localhost',
+        pool = ConnectionPool.from_url('redis://{}'.format(master_host),
                                        max_connections=max_connections)
 
         conn = pool.get_connection('ping')
@@ -119,12 +119,12 @@ def target(pool):
             assert conn.read_response() == b'PONG'
 
     @pytest.mark.parametrize('max_connections', [1, 2, None])
-    def test_close_pool_in_main(self, max_connections):
+    def test_close_pool_in_main(self, max_connections, master_host):
         """
         A child process that uses the same pool as its parent isn't affected
         when the parent disconnects all connections within the pool.
         """
-        pool = ConnectionPool.from_url('redis://localhost',
+        pool = ConnectionPool.from_url('redis://{}'.format(master_host),
                                        max_connections=max_connections)
 
         conn = pool.get_connection('ping')