diff --git a/swh/indexer/tests/tasks.py b/swh/indexer/tests/tasks.py --- a/swh/indexer/tests/tasks.py +++ b/swh/indexer/tests/tasks.py @@ -1,9 +1,10 @@ -from swh.scheduler.celery_backend.config import app +from celery import current_app as app + from swh.indexer.metadata import ( OriginMetadataIndexer, RevisionMetadataIndexer ) from .test_metadata import ContentMetadataTestIndexer -from .test_utils import BASE_TEST_CONFIG +from .utils import BASE_TEST_CONFIG class RevisionMetadataTestIndexer(RevisionMetadataIndexer): diff --git a/swh/indexer/tests/test_ctags.py b/swh/indexer/tests/test_ctags.py --- a/swh/indexer/tests/test_ctags.py +++ b/swh/indexer/tests/test_ctags.py @@ -12,7 +12,7 @@ CtagsIndexer, run_ctags ) -from swh.indexer.tests.test_utils import ( +from swh.indexer.tests.utils import ( CommonContentIndexerTest, CommonIndexerWithErrorsTest, CommonIndexerNoTool, SHA1_TO_CTAGS, NoDiskIndexer, BASE_TEST_CONFIG, diff --git a/swh/indexer/tests/test_fossology_license.py b/swh/indexer/tests/test_fossology_license.py --- a/swh/indexer/tests/test_fossology_license.py +++ b/swh/indexer/tests/test_fossology_license.py @@ -12,7 +12,7 @@ compute_license ) -from swh.indexer.tests.test_utils import ( +from swh.indexer.tests.utils import ( SHA1_TO_LICENSES, CommonContentIndexerTest, CommonContentIndexerRangeTest, CommonIndexerWithErrorsTest, CommonIndexerNoTool, NoDiskIndexer, BASE_TEST_CONFIG, fill_storage, fill_obj_storage diff --git a/swh/indexer/tests/test_language.py b/swh/indexer/tests/test_language.py --- a/swh/indexer/tests/test_language.py +++ b/swh/indexer/tests/test_language.py @@ -6,7 +6,7 @@ import unittest from swh.indexer import language from swh.indexer.language import LanguageIndexer -from swh.indexer.tests.test_utils import ( +from swh.indexer.tests.utils import ( CommonContentIndexerTest, CommonIndexerWithErrorsTest, CommonIndexerNoTool, BASE_TEST_CONFIG, fill_storage, fill_obj_storage ) diff --git a/swh/indexer/tests/test_metadata.py b/swh/indexer/tests/test_metadata.py --- a/swh/indexer/tests/test_metadata.py +++ b/swh/indexer/tests/test_metadata.py @@ -15,7 +15,7 @@ ContentMetadataIndexer, RevisionMetadataIndexer ) -from .test_utils import ( +from .utils import ( BASE_TEST_CONFIG, fill_obj_storage, fill_storage ) diff --git a/swh/indexer/tests/test_mimetype.py b/swh/indexer/tests/test_mimetype.py --- a/swh/indexer/tests/test_mimetype.py +++ b/swh/indexer/tests/test_mimetype.py @@ -9,7 +9,7 @@ MimetypeIndexer, MimetypeRangeIndexer, compute_mimetype_encoding ) -from swh.indexer.tests.test_utils import ( +from swh.indexer.tests.utils import ( CommonContentIndexerTest, CommonContentIndexerRangeTest, CommonIndexerWithErrorsTest, CommonIndexerNoTool, BASE_TEST_CONFIG, fill_storage, fill_obj_storage diff --git a/swh/indexer/tests/test_origin_head.py b/swh/indexer/tests/test_origin_head.py --- a/swh/indexer/tests/test_origin_head.py +++ b/swh/indexer/tests/test_origin_head.py @@ -6,7 +6,7 @@ import unittest from swh.indexer.origin_head import OriginHeadIndexer -from swh.indexer.tests.test_utils import ( +from swh.indexer.tests.utils import ( BASE_TEST_CONFIG, fill_storage ) diff --git a/swh/indexer/tests/test_origin_metadata.py b/swh/indexer/tests/test_origin_metadata.py --- a/swh/indexer/tests/test_origin_metadata.py +++ b/swh/indexer/tests/test_origin_metadata.py @@ -15,7 +15,7 @@ from swh.scheduler.celery_backend.runner import run_ready_tasks -from .test_utils import fill_storage, fill_obj_storage +from .utils import fill_storage, fill_obj_storage from .test_origin_head import OriginHeadTestIndexer from swh.indexer.tests.tasks import ( RevisionMetadataTestIndexer, OriginMetadataTestIndexer) diff --git a/swh/indexer/tests/test_utils.py b/swh/indexer/tests/utils.py rename from swh/indexer/tests/test_utils.py rename to swh/indexer/tests/utils.py