From 1757b0112b1e3ce6845a2e186919e744f6789b34 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont (@ardumont)" Date: Thu, 21 Nov 2019 13:40:27 +0100 Subject: [PATCH] cran/gnu: Rename task_type to load-archive-files --- swh/lister/cran/lister.py | 2 +- swh/lister/cran/tests/conftest.py | 2 +- swh/lister/cran/tests/test_lister.py | 4 ++-- swh/lister/gnu/lister.py | 2 +- swh/lister/gnu/tests/conftest.py | 2 +- swh/lister/gnu/tests/test_lister.py | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/swh/lister/cran/lister.py b/swh/lister/cran/lister.py index fdb83e0..bb11ae5 100644 --- a/swh/lister/cran/lister.py +++ b/swh/lister/cran/lister.py @@ -62,7 +62,7 @@ class CRANLister(SimpleLister): version = kwargs.get('version') assert origin_type == 'tar' return create_task_dict( - 'load-%s' % origin_type, + 'load-archive-files', policy, package, origin_url, version, retries_left=3, ) diff --git a/swh/lister/cran/tests/conftest.py b/swh/lister/cran/tests/conftest.py index 34741f2..acab30c 100644 --- a/swh/lister/cran/tests/conftest.py +++ b/swh/lister/cran/tests/conftest.py @@ -14,7 +14,7 @@ def lister_cran(swh_listers): # Add the load-deb-package in the scheduler backend lister.scheduler.create_task_type({ - 'type': 'load-tar', + 'type': 'load-archive-files', 'description': 'Load archive files', 'backend_name': 'swh.loader.package.tasks.LoadArchive', 'default_interval': '1 day', diff --git a/swh/lister/cran/tests/test_lister.py b/swh/lister/cran/tests/test_lister.py index 338579f..3e7a41a 100644 --- a/swh/lister/cran/tests/test_lister.py +++ b/swh/lister/cran/tests/test_lister.py @@ -37,11 +37,11 @@ def test_cran_lister_cran(mock_cran, datadir, lister_cran): lister_cran.run() - r = lister_cran.scheduler.search_tasks(task_type='load-tar') + r = lister_cran.scheduler.search_tasks(task_type='load-archive-files') assert len(r) == 6 for row in r: - assert row['type'] == 'load-tar' + assert row['type'] == 'load-archive-files' # arguments check args = row['arguments']['args'] assert len(args) == 3 diff --git a/swh/lister/gnu/lister.py b/swh/lister/gnu/lister.py index a3e1714..ddd3371 100644 --- a/swh/lister/gnu/lister.py +++ b/swh/lister/gnu/lister.py @@ -51,7 +51,7 @@ class GNULister(SimpleLister): artifacts = self.gnu_tree.artifacts[origin_url] assert origin_type == 'tar' return utils.create_task_dict( - 'load-%s' % origin_type, + 'load-archive-files', kwargs.get('policy', 'oneshot'), url=origin_url, artifacts=artifacts, diff --git a/swh/lister/gnu/tests/conftest.py b/swh/lister/gnu/tests/conftest.py index a766127..dec733c 100644 --- a/swh/lister/gnu/tests/conftest.py +++ b/swh/lister/gnu/tests/conftest.py @@ -14,7 +14,7 @@ def lister_gnu(swh_listers): # Add the load-deb-package in the scheduler backend lister.scheduler.create_task_type({ - 'type': 'load-tar', + 'type': 'load-archive-files', 'description': 'Load archive files', 'backend_name': 'swh.loader.package.tasks.LoadArchive', 'default_interval': '1 day', diff --git a/swh/lister/gnu/tests/test_lister.py b/swh/lister/gnu/tests/test_lister.py index 9176ae2..781bad3 100644 --- a/swh/lister/gnu/tests/test_lister.py +++ b/swh/lister/gnu/tests/test_lister.py @@ -12,11 +12,11 @@ logger = logging.getLogger(__name__) def test_gnu_lister(lister_gnu, requests_mock_datadir): lister_gnu.run() - r = lister_gnu.scheduler.search_tasks(task_type='load-tar') + r = lister_gnu.scheduler.search_tasks(task_type='load-archive-files') assert len(r) == 383 for row in r: - assert row['type'] == 'load-tar' + assert row['type'] == 'load-archive-files' # arguments check args = row['arguments']['args'] assert len(args) == 0