move fixtures.py to standardized location conftest.py

3 files changed, 2 insertions, 4 deletions

diff --git a/tests/fixtures.py b/tests/conftest.py
index 1b32866..1858ab8 100644
--- a/tests/fixtures.py
+++ b/tests/conftest.py
@@ -9,14 +9,13 @@ def mastodon():
             client_secret='__MASTODON_PY_TEST_SECRET',
             access_token='__MASTODON_PY_TEST_TOKEN')
 
-
-
 @pytest.fixture()
 def status(mastodon):
     _status = mastodon.status_post('Toot!')
     yield _status
     mastodon.status_delete(_status['id'])
 
+
 @pytest.fixture()
 def vcr_config():
     return dict(
diff --git a/tests/test_hooks.py b/tests/test_hooks.py
index fe242a6..132021b 100644
--- a/tests/test_hooks.py
+++ b/tests/test_hooks.py
@@ -1,4 +1,4 @@
-from .fixtures import *
+import pytest
 from datetime import datetime
 
 @pytest.mark.vcr()
diff --git a/tests/test_instance.py b/tests/test_instance.py
index d6f1bed..3ea3cf1 100644
--- a/tests/test_instance.py
+++ b/tests/test_instance.py
@@ -1,4 +1,3 @@
-from .fixtures import *
 import pytest
 
 @pytest.mark.vcr()