diff --git a/requirements-swh.txt b/requirements-swh.txt --- a/requirements-swh.txt +++ b/requirements-swh.txt @@ -1,4 +1,4 @@ swh.model >= 0.4.0 swh.storage >= 0.10.0 swh.scheduler >= 0.0.39 -swh.loader.core >= 0.5.2 +swh.loader.core >= 0.5.5 diff --git a/swh/loader/mercurial/tests/test_loader.py b/swh/loader/mercurial/tests/test_loader.py --- a/swh/loader/mercurial/tests/test_loader.py +++ b/swh/loader/mercurial/tests/test_loader.py @@ -11,7 +11,7 @@ import hglib import pytest -from swh.model import hashutil +from swh.model.hashutil import hash_to_bytes from swh.model.model import RevisionType from swh.storage.algos.snapshot import snapshot_get_latest from swh.loader.tests import ( @@ -39,7 +39,7 @@ repo_url, status="full", type="hg", - snapshot=hashutil.hash_to_bytes("3b8fe58e467deb7597b12a5fd3b2c096b8c02028"), + snapshot=hash_to_bytes("3b8fe58e467deb7597b12a5fd3b2c096b8c02028"), ) stats = get_stats(loader.storage) @@ -60,9 +60,15 @@ expected_snapshot = { "id": "3b8fe58e467deb7597b12a5fd3b2c096b8c02028", "branches": { - "develop": {"target": tip_revision_develop, "target_type": "revision"}, - "default": {"target": tip_revision_default, "target_type": "revision"}, - "HEAD": {"target": "develop", "target_type": "alias",}, + b"develop": { + "target": hash_to_bytes(tip_revision_develop), + "target_type": "revision", + }, + b"default": { + "target": hash_to_bytes(tip_revision_default), + "target_type": "revision", + }, + b"HEAD": {"target": b"develop", "target_type": "alias",}, }, } @@ -90,7 +96,7 @@ archive_path, status="full", type="hg", - snapshot=hashutil.hash_to_bytes("3b8fe58e467deb7597b12a5fd3b2c096b8c02028"), + snapshot=hash_to_bytes("3b8fe58e467deb7597b12a5fd3b2c096b8c02028"), ) @@ -121,22 +127,23 @@ # cf. test_loader.org for explaining from where those hashes tip_release = "515c4d72e089404356d0f4b39d60f948b8999140" - release = loader.storage.release_get([hashutil.hash_to_bytes(tip_release)]) + release = loader.storage.release_get([hash_to_bytes(tip_release)]) assert release is not None tip_revision_default = "c3dbe4fbeaaa98dd961834e4007edb3efb0e2a27" - revision = loader.storage.revision_get( - [hashutil.hash_to_bytes(tip_revision_default)] - ) + revision = loader.storage.revision_get([hash_to_bytes(tip_revision_default)]) assert revision is not None expected_snapshot_id = "d35668e02e2ba4321dc951cd308cf883786f918a" expected_snapshot = { "id": expected_snapshot_id, "branches": { - "default": {"target": tip_revision_default, "target_type": "revision"}, - "0.1": {"target": tip_release, "target_type": "release"}, - "HEAD": {"target": "default", "target_type": "alias",}, + b"default": { + "target": hash_to_bytes(tip_revision_default), + "target_type": "revision", + }, + b"0.1": {"target": hash_to_bytes(tip_release), "target_type": "release",}, + b"HEAD": {"target": b"default", "target_type": "alias",}, }, } @@ -167,7 +174,7 @@ archive_path, status="full", type="hg", - snapshot=hashutil.hash_to_bytes(expected_snapshot_id), + snapshot=hash_to_bytes(expected_snapshot_id), )