aboutsummaryrefslogtreecommitdiff
path: root/tests/conftest.py
diff options
context:
space:
mode:
authorMax Nanis2026-08-21 11:31:13 -0700
committerMax Nanis2026-08-21 11:31:13 -0700
commitff538deb290c851364df85aa6ccc64bc3719ef64 (patch)
treec04c3573ab6adab70971fef00d3420a5da5f9619 /tests/conftest.py
parent4fe0f6b5e0f0c744902e4c3ab8940e23a6f8a2e1 (diff)
parentc4a44873540ca4c0a3ab19b9beef4cfc6e0252a7 (diff)
downloadgeneralresearch-ff538deb290c851364df85aa6ccc64bc3719ef64.tar.gz
generalresearch-ff538deb290c851364df85aa6ccc64bc3719ef64.zip
Merge branch 'master' into dev
Diffstat (limited to 'tests/conftest.py')
-rw-r--r--tests/conftest.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index 2482269..6748592 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -3,8 +3,6 @@ pytest_plugins = [
"test_utils.conftest",
# -- GRL IQ
"test_utils.grliq.conftest",
- "test_utils.grliq.managers.conftest",
- "test_utils.grliq.models.conftest",
# -- Incite
"test_utils.incite.conftest",
"test_utils.incite.collections.conftest",
@@ -12,9 +10,17 @@ pytest_plugins = [
# -- Managers
"test_utils.managers.conftest",
"test_utils.managers.contest.conftest",
+ "test_utils.managers.gr.conftest",
"test_utils.managers.ledger.conftest",
"test_utils.managers.network.conftest",
+ "test_utils.managers.thl.conftest",
"test_utils.managers.upk.conftest",
# -- Models
"test_utils.models.conftest",
+ "test_utils.models.contest.conftest",
+ "test_utils.models.gr.conftest",
+ "test_utils.models.ledger.conftest",
+ "test_utils.models.network.conftest",
+ "test_utils.models.thl.conftest",
+ "test_utils.models.upk.conftest",
]