reonokiy/swh-lister
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cran/gnu: Rename task_type to load-archive-files

Browse source
This commit is contained in:
Antoine R. Dumont (@ardumont) 2019-11-21 13:40:27 +01:00
parent 1cf7c8e86b
commit 1757b0112b
No known key found for this signature in database
GPG key ID: 52E2E9840D10C3B8
6 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
swh/lister/cran/lister.py
View file

@ -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,
)

2
swh/lister/cran/tests/conftest.py
View file

@ -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',

4
swh/lister/cran/tests/test_lister.py
View file

@ -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

2
swh/lister/gnu/lister.py
View file

@ -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,

2
swh/lister/gnu/tests/conftest.py
View file

@ -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',

4
swh/lister/gnu/tests/test_lister.py
View file

@ -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