Add redis to docker-compose and config, conftest

hjwp · hjwp · commit cc1ecbbed3ab · 2019-07-26T15:30:09.000+01:00
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,6 +7,7 @@ services:
       dockerfile: Dockerfile
     depends_on:
       - postgres
+      - redis
     environment:
       - DB_HOST=postgres
       - DB_PASSWORD=abc123
@@ -27,3 +28,8 @@ services:
     ports:
       - "54321:5432"
 
+  redis:
+    image: redis:alpine
+    ports:
+      - "63791:6379"
+
diff --git a/mypy.ini b/mypy.ini
@@ -10,3 +10,5 @@ ignore_missing_imports = True
 [mypy-sqlalchemy.*]
 ignore_missing_imports = True
 
+[mypy-redis.*]
+ignore_missing_imports = True
diff --git a/requirements.txt b/requirements.txt
@@ -9,3 +9,4 @@ pytest-icdiff
 mypy
 requests
 
+redis
diff --git a/src/allocation/config.py b/src/allocation/config.py
@@ -14,3 +14,8 @@ def get_api_url():
     port = 5005 if host == 'localhost' else 80
     return f"http://{host}:{port}"
 
+def get_redis_host_and_port():
+    host = os.environ.get('REDIS_HOST', 'localhost')
+    port = 63791 if host == 'localhost' else 6379
+    return dict(host=host, port=port)
+
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,10 +1,14 @@
 # pylint: disable=redefined-outer-name
+import shutil
+import subprocess
 import time
 from pathlib import Path
 
 import pytest
+import redis
 import requests
-from requests.exceptions import ConnectionError
+from requests.exceptions import RequestException
+from redis.exceptions import RedisError
 from sqlalchemy.exc import OperationalError
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker, clear_mappers
@@ -46,11 +50,21 @@ def wait_for_webapp_to_come_up():
     while time.time() < deadline:
         try:
             return requests.get(url)
-        except ConnectionError:
+        except RequestException:
             time.sleep(0.5)
     pytest.fail('API never came up')
 
 
+def wait_for_redis_to_come_up():
+    deadline = time.time() + 5
+    r = redis.Redis(**config.get_redis_host_and_port())
+    while time.time() < deadline:
+        try:
+            return r.ping()
+        except RedisError:
+            time.sleep(0.5)
+    pytest.fail('Redis never came up')
+
 
 @pytest.fixture(scope='session')
 def postgres_db():
@@ -76,3 +90,11 @@ def restart_api():
     time.sleep(0.5)
     wait_for_webapp_to_come_up()
 
+@pytest.fixture
+def restart_redis_pubsub():
+    wait_for_redis_to_come_up()
+    if not shutil.which('docker-compose'):
+        print('skipping restart, assumes running in container')
+        return
+    subprocess.run(['docker-compose', 'restart', '-t', '0', 'redis_pubsub'])
+

Original file line number	Diff line number	Diff line change
`@@ -9,3 +9,4 @@ pytest-icdiff`
`9`	`9`	`mypy`
`10`	`10`	`requests`
`11`	`11`
	`12`	`+redis`