move pytest_plugins to root conftest

https://docs.pytest.org/en/latest/writing_plugins.html#requiring-plugins-in-non-root-conftests
getsentry · Dec 19, 2019 · 2b1f454 · 2b1f454
1 parent 1c710a5
commit 2b1f454
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/conftest.py b/conftest.py
@@ -6,7 +6,13 @@
 
 import pytest
 
-pytest_plugins = ["sentry.utils.pytest"]
+pytest_plugins = [
+    "sentry.utils.pytest.sentry",
+    "sentry.utils.pytest.selenium",
+    "sentry.utils.pytest.fixtures",
+    "sentry.utils.pytest.unittest",
+    "sentry.utils.pytest.kafka",
+]
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src"))
 

diff --git a/src/sentry/utils/pytest/__init__.py b/src/sentry/utils/pytest/__init__.py
@@ -1,9 +1 @@
 from __future__ import absolute_import
-
-pytest_plugins = [
-    "sentry.utils.pytest.sentry",
-    "sentry.utils.pytest.selenium",
-    "sentry.utils.pytest.fixtures",
-    "sentry.utils.pytest.unittest",
-    "sentry.utils.pytest.kafka",
-]