diff --git a/swh/web/tests/api/views/test_release.py b/swh/web/tests/api/views/test_release.py --- a/swh/web/tests/api/views/test_release.py +++ b/swh/web/tests/api/views/test_release.py @@ -7,7 +7,9 @@ from hypothesis import given from swh.model.hashutil import hash_to_bytes, hash_to_hex -from swh.model.model import Person, Release, TimestampWithTimezone +from swh.model.model import ( + ObjectType, Person, Release, Timestamp, TimestampWithTimezone +) from swh.web.common.utils import reverse from swh.web.tests.data import random_sha1 from swh.web.tests.strategies import ( @@ -36,10 +38,11 @@ @given(content(), directory(), release()) def test_api_release_target_type_not_a_revision(api_client, archive_data, content, directory, release): - for target_type, target in (('content', content), ('directory', directory), - ('release', release)): + for target_type, target in ((ObjectType.CONTENT, content), + (ObjectType.DIRECTORY, directory), + (ObjectType.RELEASE, release)): - if target_type == 'content': + if target_type == ObjectType.CONTENT: target = target['sha1_git'] sample_release = Release( @@ -49,7 +52,9 @@ name=b'author' ), date=TimestampWithTimezone( - timestamp=int(datetime.now().timestamp()), + timestamp=Timestamp( + seconds=int(datetime.now().timestamp()), + microseconds=0), offset=0, negative_utc=False, ), @@ -71,12 +76,12 @@ expected_release = archive_data.release_get(new_release_id) - if target_type == 'content': + if target_type == ObjectType.CONTENT: url_args = {'q': 'sha1_git:%s' % target} else: url_args = {'sha1_git': target} - target_url = reverse('api-1-%s' % target_type, + target_url = reverse('api-1-%s' % target_type.value, url_args=url_args, request=rv.wsgi_request) expected_release['target_url'] = target_url diff --git a/swh/web/tests/data.py b/swh/web/tests/data.py --- a/swh/web/tests/data.py +++ b/swh/web/tests/data.py @@ -12,7 +12,7 @@ from swh.indexer.mimetype import MimetypeIndexer from swh.indexer.ctags import CtagsIndexer from swh.indexer.storage import get_indexer_storage -from swh.model.hashutil import hash_to_hex, DEFAULT_ALGORITHMS +from swh.model.hashutil import hash_to_hex, hash_to_bytes, DEFAULT_ALGORITHMS from swh.model.model import Directory, Origin from swh.loader.git.from_disk import GitLoaderFromArchive from swh.search import get_search @@ -188,7 +188,7 @@ storage.origin_visit_update( url, visit.visit, status='full', - snapshot='1a8893e6a86f444e8be8e7bda6cb34fb1735a00e') + snapshot=hash_to_bytes('1a8893e6a86f444e8be8e7bda6cb34fb1735a00e')) contents = set() directories = set() diff --git a/swh/web/tests/strategies.py b/swh/web/tests/strategies.py --- a/swh/web/tests/strategies.py +++ b/swh/web/tests/strategies.py @@ -16,7 +16,9 @@ from swh.model.hashutil import hash_to_hex, hash_to_bytes from swh.model.identifiers import directory_identifier -from swh.model.model import Person, Revision, TimestampWithTimezone +from swh.model.model import ( + Person, Revision, RevisionType, TimestampWithTimezone +) from swh.storage.algos.revisions_walker import get_revisions_walker from swh.model.hypothesis_strategies import ( origins as new_origin_strategy, snapshots as new_snapshot @@ -366,7 +368,7 @@ committer_date=TimestampWithTimezone.from_datetime( draw(new_swh_date())), synthetic=False, - type='git', + type=RevisionType.GIT, )