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 @@ -23,7 +23,7 @@ }] -class TestLanguageIndexer(ContentLanguageIndexer): +class LanguageTestIndexer(ContentLanguageIndexer): """Specific language whose configuration is enough to satisfy the indexing tests. """ @@ -72,7 +72,7 @@ # given # testing python sha1s = ['02fb2c89e14f7fab46701478c83779c7beb7b069'] - lang_indexer = TestLanguageIndexer() + lang_indexer = LanguageTestIndexer() # when lang_indexer.run(sha1s, policy_update='ignore-dups') @@ -90,7 +90,7 @@ # given # testing c sha1s = ['103bc087db1d26afc3a0283f38663d081e9b01e6'] - lang_indexer = TestLanguageIndexer() + lang_indexer = LanguageTestIndexer() # when lang_indexer.run(sha1s, policy_update='ignore-dups') 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 @@ from swh.indexer.tests.test_utils import MockIndexerStorage -class TestContentMetadataIndexer(ContentMetadataIndexer): +class ContentMetadataTestIndexer(ContentMetadataIndexer): """Specific Metadata whose configuration is enough to satisfy the indexing tests. """ @@ -29,12 +29,12 @@ self.results = [] -class TestRevisionMetadataIndexer(RevisionMetadataIndexer): +class RevisionMetadataTestIndexer(RevisionMetadataIndexer): """Specific indexer whose configuration is enough to satisfy the indexing tests. """ - ContentMetadataIndexer = TestContentMetadataIndexer + ContentMetadataIndexer = ContentMetadataTestIndexer def prepare(self): self.config = { @@ -223,7 +223,7 @@ '02fb2c89e14f7fab46701478c83779c7beb7b069'] # this metadata indexer computes only metadata for package.json # in npm context with a hard mapping - metadata_indexer = TestContentMetadataIndexer( + metadata_indexer = ContentMetadataTestIndexer( tool=self.content_tool, config={}) # when @@ -330,7 +330,7 @@ self.assertEqual(expected_results, results) def test_revision_metadata_indexer(self): - metadata_indexer = TestRevisionMetadataIndexer() + metadata_indexer = RevisionMetadataTestIndexer() sha1_gits = [ b'8dbb6aeb036e7fd80664eb8bfd1507881af1ba9f', 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 @@ -25,7 +25,7 @@ }] -class TestMimetypeIndexer(ContentMimetypeIndexer): +class MimetypeTestIndexer(ContentMimetypeIndexer): """Specific mimetype whose configuration is enough to satisfy the indexing tests. @@ -50,7 +50,7 @@ self.tool = self.tools[0] -class TestMimetypeIndexerUnknownToolStorage(TestMimetypeIndexer): +class MimetypeIndexerUnknownToolTestStorage(MimetypeTestIndexer): """Specific mimetype whose configuration is not enough to satisfy the indexing tests. @@ -64,12 +64,12 @@ def test_wrong_unknown_configuration_tool(self): """Indexer with unknown configuration tool should fail the check""" with self.assertRaisesRegex(ValueError, 'Tools None is unknown'): - TestMimetypeIndexerUnknownToolStorage() + MimetypeIndexerUnknownToolTestStorage() -class TestMimetypeIndexerTest(unittest.TestCase): +class TestMimetypeIndexer(unittest.TestCase): def setUp(self): - self.indexer = TestMimetypeIndexer() + self.indexer = MimetypeTestIndexer() def test_index_no_update(self): # given diff --git a/swh/indexer/tests/test_orchestrator.py b/swh/indexer/tests/test_orchestrator.py --- a/swh/indexer/tests/test_orchestrator.py +++ b/swh/indexer/tests/test_orchestrator.py @@ -84,7 +84,7 @@ return Indexer3().run(*args, **kwargs) -class TestOrchestrator12(BaseOrchestratorIndexer): +class BaseTestOrchestrator12(BaseOrchestratorIndexer): TASK_NAMES = { 'indexer1': 'swh.indexer.tests.test_orchestrator.indexer1_task', 'indexer2': 'swh.indexer.tests.test_orchestrator.indexer2_task', @@ -122,7 +122,7 @@ } -class MockedTestOrchestrator12(TestOrchestrator12): +class MockedTestOrchestrator12(BaseTestOrchestrator12): def __init__(self): super().__init__() self.created_tasks = [] @@ -145,7 +145,7 @@ 'swh.indexer.tests.test_orchestrator.indexer2_task') def test_orchestrator_filter(self): - o = TestOrchestrator12() + o = BaseTestOrchestrator12() o.scheduler = self.scheduler o.run(['id12', 'id2']) self.assertEqual(Indexer2.indexed, []) 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 @@ -10,7 +10,7 @@ from swh.indexer.tests.test_utils import MockIndexerStorage, MockStorage -class TestOriginHeadIndexer(OriginHeadIndexer): +class OriginHeadTestIndexer(OriginHeadIndexer): """Specific indexer whose configuration is enough to satisfy the indexing tests. """ @@ -40,7 +40,7 @@ class OriginHead(unittest.TestCase): def test_git(self): - indexer = TestOriginHeadIndexer() + indexer = OriginHeadTestIndexer() indexer.run( ['git+https://github.com/SoftwareHeritage/swh-storage'], 'update-dups', parse_ids=True) @@ -50,7 +50,7 @@ 'origin_id': 52189575}]) def test_ftp(self): - indexer = TestOriginHeadIndexer() + indexer = OriginHeadTestIndexer() indexer.run( ['ftp+rsync://ftp.gnu.org/gnu/3dldf'], 'update-dups', parse_ids=True) @@ -60,7 +60,7 @@ 'origin_id': 4423668}]) def test_deposit(self): - indexer = TestOriginHeadIndexer() + indexer = OriginHeadTestIndexer() indexer.run( ['deposit+https://forge.softwareheritage.org/source/' 'jesuisgpl/'], @@ -71,7 +71,7 @@ 'origin_id': 77775770}]) def test_pypi(self): - indexer = TestOriginHeadIndexer() + indexer = OriginHeadTestIndexer() indexer.run( ['pypi+https://pypi.org/project/limnoria/'], 'update-dups', parse_ids=True) @@ -81,7 +81,7 @@ 'origin_id': 85072327}]) def test_svn(self): - indexer = TestOriginHeadIndexer() + indexer = OriginHeadTestIndexer() indexer.run( ['svn+http://0-512-md.googlecode.com/svn/'], 'update-dups', parse_ids=True) 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 @@ -11,13 +11,13 @@ from swh.indexer.metadata import OriginMetadataIndexer from swh.indexer.tests.test_utils import MockObjStorage, MockStorage from swh.indexer.tests.test_utils import MockIndexerStorage -from swh.indexer.tests.test_origin_head import TestOriginHeadIndexer -from swh.indexer.tests.test_metadata import TestRevisionMetadataIndexer +from swh.indexer.tests.test_origin_head import OriginHeadTestIndexer +from swh.indexer.tests.test_metadata import RevisionMetadataTestIndexer from swh.scheduler.tests.scheduler_testing import SchedulerTestFixture -class TestOriginMetadataIndexer(OriginMetadataIndexer): +class OriginMetadataTestIndexer(OriginMetadataIndexer): def prepare(self): self.config = { 'storage': { @@ -44,19 +44,19 @@ @task def revision_metadata_test_task(*args, **kwargs): - indexer = TestRevisionMetadataIndexer() + indexer = RevisionMetadataTestIndexer() indexer.run(*args, **kwargs) return indexer.results @task def origin_intrinsic_metadata_test_task(*args, **kwargs): - indexer = TestOriginMetadataIndexer() + indexer = OriginMetadataTestIndexer() indexer.run(*args, **kwargs) return indexer.results -class TestOriginHeadIndexer(TestOriginHeadIndexer): +class OriginHeadTestIndexer(OriginHeadTestIndexer): revision_metadata_task = 'revision_metadata_test_task' origin_intrinsic_metadata_task = 'origin_intrinsic_metadata_test_task' @@ -74,14 +74,14 @@ 'origin_intrinsic_metadata_test_task', 'swh.indexer.tests.test_origin_metadata.' 'origin_intrinsic_metadata_test_task') - TestRevisionMetadataIndexer.scheduler = self.scheduler + RevisionMetadataTestIndexer.scheduler = self.scheduler def tearDown(self): - del TestRevisionMetadataIndexer.scheduler + del RevisionMetadataTestIndexer.scheduler super().tearDown() def test_pipeline(self): - indexer = TestOriginHeadIndexer() + indexer = OriginHeadTestIndexer() indexer.scheduler = self.scheduler indexer.run( ["git+https://github.com/librariesio/yarn-parser"],