Run tests across multiple cores/CPUs

Author: Andrew Brookins

Makefile

@@ -44,7 +44,7 @@ format: $(INSTALL_STAMP)
 
 .PHONY: test
 test: $(INSTALL_STAMP)
-	$(POETRY) run pytest -s -vv ./tests/ --cov-report term-missing --cov $(NAME)
+	$(POETRY) run pytest -n auto -s -vv ./tests/ --cov-report term-missing --cov $(NAME)
 
 .PHONY: shell
 shell: $(INSTALL_STAMP)

poetry.lock

@@ -29,6 +29,7 @@ flake8 = "^4.0.1"
 bandit = "^1.7.0"
 coverage = "^6.0.2"
 pytest-cov = "^3.0.0"
+pytest-xdist = "^2.4.0"
 
 
 [tool.poetry.scripts]

pyproject.toml

@@ -47,10 +47,10 @@ def create_index(index_name, schema, current_hash):
     try:
         redis.execute_command(f"ft.info {index_name}")
     except ResponseError:
+        redis.execute_command(f"ft.create {index_name} {schema}")
+        redis.set(schema_hash_key(index_name), current_hash)
+    else:
         log.info("Index already exists, skipping. Index hash: %s", index_name)
-        return
-    redis.execute_command(f"ft.create {index_name} {schema}")
-    redis.set(schema_hash_key(index_name), current_hash)
 
 
 class MigrationAction(Enum):
@@ -74,10 +74,16 @@ def run(self):
             self.drop()
 
     def create(self):
-        return create_index(self.index_name, self.schema, self.hash)
+        try:
+            return create_index(self.index_name, self.schema, self.hash)
+        except ResponseError:
+            log.info("Index already exists: %s", self.index_name)
 
     def drop(self):
-        redis.execute_command(f"FT.DROPINDEX {self.index_name}")
+        try:
+            redis.execute_command(f"FT.DROPINDEX {self.index_name}")
+        except ResponseError:
+            log.info("Index does not exist: %s", self.index_name)
 
 
 class Migrator:

redis_developer/model/migrations/migrator.py

@@ -1,30 +1,30 @@
+import random
+
 import pytest
 from redis import Redis
 
 from redis_developer.connections import get_redis_connection
-from redis_developer.model.migrations.migrator import Migrator
-
-
-@pytest.fixture(scope="module", autouse=True)
-def migrations():
-    Migrator().run()
 
 
 @pytest.fixture
 def redis():
     yield get_redis_connection()
 
 
-@pytest.fixture
-def key_prefix():
-    yield "redis-developer"
-
-
 def _delete_test_keys(prefix: str, conn: Redis):
+    keys = []
     for key in conn.scan_iter(f"{prefix}:*"):
-        conn.delete(key)
+        keys.append(key)
+    if keys:
+        conn.delete(*keys)
+
 
+@pytest.fixture
+def key_prefix(redis):
+    key_prefix = f"redis-developer:{random.random()}"
+    yield key_prefix
+    _delete_test_keys(key_prefix, redis)
 
-@pytest.fixture(scope="function", autouse=True)
+@pytest.fixture(autouse=True)
 def delete_test_keys(redis, request, key_prefix):
     _delete_test_keys(key_prefix, redis)