diff --git a/ami/main/apps.py b/ami/main/apps.py index eb6c9ee08..3de4c51c5 100644 --- a/ami/main/apps.py +++ b/ami/main/apps.py @@ -8,6 +8,6 @@ class MainConfig(AppConfig): verbose_name = _("Main") def ready(self): - from tests.fixtures.signals import setup_complete_test_project + from ami.tests.fixtures.signals import setup_complete_test_project post_migrate.connect(setup_complete_test_project, sender=self) diff --git a/ami/main/tests.py b/ami/main/tests.py index 7c515b41f..d422db060 100644 --- a/ami/main/tests.py +++ b/ami/main/tests.py @@ -7,8 +7,8 @@ from rich import print from ami.main.models import Event, Occurrence, Project, Taxon, TaxonRank, group_images_into_events +from ami.tests.fixtures.main import create_captures, create_occurrences, create_taxa, setup_test_project from ami.users.models import User -from tests.fixtures.main import create_captures, create_occurrences, create_taxa, setup_test_project logger = logging.getLogger(__name__) diff --git a/tests/fixtures/images.py b/ami/tests/fixtures/images.py similarity index 100% rename from tests/fixtures/images.py rename to ami/tests/fixtures/images.py diff --git a/tests/fixtures/main.py b/ami/tests/fixtures/main.py similarity index 99% rename from tests/fixtures/main.py rename to ami/tests/fixtures/main.py index c243cdd81..4d1102fb5 100644 --- a/tests/fixtures/main.py +++ b/ami/tests/fixtures/main.py @@ -18,7 +18,7 @@ group_images_into_events, ) from ami.ml.tasks import create_detection_images -from tests.fixtures.storage import GeneratedTestFrame, create_storage_source, populate_bucket +from ami.tests.fixtures.storage import GeneratedTestFrame, create_storage_source, populate_bucket logger = logging.getLogger(__name__) diff --git a/tests/fixtures/signals.py b/ami/tests/fixtures/signals.py similarity index 100% rename from tests/fixtures/signals.py rename to ami/tests/fixtures/signals.py diff --git a/tests/fixtures/storage.py b/ami/tests/fixtures/storage.py similarity index 97% rename from tests/fixtures/storage.py rename to ami/tests/fixtures/storage.py index ba6547523..d9bbde3de 100644 --- a/tests/fixtures/storage.py +++ b/ami/tests/fixtures/storage.py @@ -4,8 +4,8 @@ from django.conf import settings from ami.main.models import Project, S3StorageSource +from ami.tests.fixtures.images import GeneratedTestFrame, generate_moth_series from ami.utils import s3 -from tests.fixtures.images import GeneratedTestFrame, generate_moth_series logger = logging.getLogger(__name__) diff --git a/tests/test_doctests.py b/ami/tests/test_doctests.py similarity index 100% rename from tests/test_doctests.py rename to ami/tests/test_doctests.py diff --git a/tests/test_merge_production_dotenvs_in_dotenv.py b/ami/tests/test_merge_production_dotenvs_in_dotenv.py similarity index 100% rename from tests/test_merge_production_dotenvs_in_dotenv.py rename to ami/tests/test_merge_production_dotenvs_in_dotenv.py diff --git a/tests/test_storage.py b/ami/tests/test_storage.py similarity index 98% rename from tests/test_storage.py rename to ami/tests/test_storage.py index 5d41b53ef..8a0a5f27b 100644 --- a/tests/test_storage.py +++ b/ami/tests/test_storage.py @@ -5,9 +5,9 @@ from django.test import TestCase from ami.main.models import S3StorageSource +from ami.tests.fixtures.main import create_captures_from_files, setup_test_project +from ami.tests.fixtures.storage import S3_TEST_CONFIG from ami.utils import s3 -from tests.fixtures.main import create_captures_from_files, setup_test_project -from tests.fixtures.storage import S3_TEST_CONFIG logger = logging.getLogger(__name__) diff --git a/tests/__init__.py b/tests/__init__.py deleted file mode 100644 index 524385025..000000000 --- a/tests/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -import doctest - -__test__ = {"Doctest": doctest}