lister.tests: Avoid duplication setup step

And remove unnecessary fixture redefinition which causes indirection.

swh/lister/core/tests/conftest.py

@@ -36,4 +36,12 @@ def swh_listers(request, postgresql_proc, postgresql, swh_scheduler):
         listers[lister_name] = lister
     initialize(create_engine(db_url), drop_tables=True)
 
+    # Add the load-archive-files expected by some listers (gnu, cran, ...)
+    swh_scheduler.create_task_type({
+        'type': 'load-archive-files',
+        'description': 'Load archive files.',
+        'backend_name': 'swh.loader.package.tasks.LoadArchive',
+        'default_interval': '1 day',
+    })
+
     return listers

swh/lister/cran/tests/conftest.py

@@ -3,21 +3,4 @@
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
-import pytest
-
 from swh.lister.core.tests.conftest import *  # noqa
-
-
-@pytest.fixture
-def lister_cran(swh_listers):
-    lister = swh_listers['cran']
-
-    # Add the load-deb-package in the scheduler backend
-    lister.scheduler.create_task_type({
-        'type': 'load-archive-files',
-        'description': 'Load archive files.',
-        'backend_name': 'swh.loader.package.tasks.LoadArchive',
-        'default_interval': '1 day',
-    })
-
-    return lister

swh/lister/cran/tests/test_lister.py

@@ -28,16 +28,18 @@ def test_cran_compute_package_url_failure():
 
 
 @patch('swh.lister.cran.lister.read_cran_data')
-def test_cran_lister_cran(mock_cran, datadir, lister_cran):
+def test_cran_lister_cran(mock_cran, datadir, swh_listers):
+    lister = swh_listers['cran']
+
     with open(path.join(datadir, 'list-r-packages.json')) as f:
         data = json.loads(f.read())
 
     mock_cran.return_value = data
     assert len(data) == 6
 
-    lister_cran.run()
+    lister.run()
 
-    r = lister_cran.scheduler.search_tasks(task_type='load-archive-files')
+    r = lister.scheduler.search_tasks(task_type='load-archive-files')
     assert len(r) == 6
 
     for row in r:

swh/lister/gnu/tests/conftest.py

@@ -3,21 +3,4 @@
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
-import pytest
-
 from swh.lister.core.tests.conftest import *  # noqa
-
-
-@pytest.fixture
-def lister_gnu(swh_listers):
-    lister = swh_listers['gnu']
-
-    # Add the load-deb-package in the scheduler backend
-    lister.scheduler.create_task_type({
-        'type': 'load-archive-files',
-        'description': 'Load archive files.',
-        'backend_name': 'swh.loader.package.tasks.LoadArchive',
-        'default_interval': '1 day',
-    })
-
-    return lister

swh/lister/gnu/tests/test_lister.py

@@ -9,10 +9,12 @@ import logging
 logger = logging.getLogger(__name__)
 
 
-def test_gnu_lister(lister_gnu, requests_mock_datadir):
-    lister_gnu.run()
+def test_gnu_lister(swh_listers, requests_mock_datadir):
+    lister = swh_listers['gnu']
 
-    r = lister_gnu.scheduler.search_tasks(task_type='load-archive-files')
+    lister.run()
+
+    r = lister.scheduler.search_tasks(task_type='load-archive-files')
     assert len(r) == 383
 
     for row in r: