summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Godwin2022-11-20 23:07:57 -0700
committerAndrew Godwin2022-11-20 23:08:09 -0700
commitda936cd7df299d81b6c83d219ae54cf0075d88c7 (patch)
tree7d78945b43788493df761172599be86e81f48051
parentf20cd3eb15a00110706d065e2368c23472a42eb8 (diff)
downloadtakahe-da936cd7df299d81b6c83d219ae54cf0075d88c7.tar.gz
takahe-da936cd7df299d81b6c83d219ae54cf0075d88c7.tar.bz2
takahe-da936cd7df299d81b6c83d219ae54cf0075d88c7.zip
Don't try to make a keypair during tests
-rw-r--r--takahe/settings/base.py2
-rw-r--r--takahe/settings/testing.py2
-rw-r--r--users/apps.py8
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()