From da936cd7df299d81b6c83d219ae54cf0075d88c7 Mon Sep 17 00:00:00 2001
From: Andrew Godwin
Date: Sun, 20 Nov 2022 23:07:57 -0700
Subject: Don't try to make a keypair during tests

---
 takahe/settings/base.py    | 2 ++
 takahe/settings/testing.py | 2 ++
 users/apps.py              | 8 +++++---
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/takahe/settings/base.py b/takahe/settings/base.py
index 0ab3035..660ec9f 100644
--- a/takahe/settings/base.py
+++ b/takahe/settings/base.py
@@ -118,3 +118,5 @@ AUTO_ADMIN_EMAIL: Optional[str] = None
 STATOR_TOKEN: Optional[str] = None
 
 SENTRY_ENABLED = False
+
+IN_TESTS = False
diff --git a/takahe/settings/testing.py b/takahe/settings/testing.py
index 6527333..7dffa2a 100644
--- a/takahe/settings/testing.py
+++ b/takahe/settings/testing.py
@@ -2,3 +2,5 @@ from .base import *  # noqa
 
 # Fixed secret key
 SECRET_KEY = "testing_secret"
+
+IN_TESTS = True
diff --git a/users/apps.py b/users/apps.py
index 05b5c3f..86a8eb3 100644
--- a/users/apps.py
+++ b/users/apps.py
@@ -1,4 +1,5 @@
 from django.apps import AppConfig
+from django.conf import settings
 
 
 class UsersConfig(AppConfig):
@@ -6,7 +7,8 @@ class UsersConfig(AppConfig):
     name = "users"
 
     def ready(self) -> None:
-        # Generate the server actor keypair if needed
-        from users.models import SystemActor
+        if not settings.IN_TESTS:
+            # Generate the server actor keypair if needed
+            from users.models import SystemActor
 
-        SystemActor.generate_keys_if_needed()
+            SystemActor.generate_keys_if_needed()
-- 
cgit v1.2.3