diff --git a/requirements-swh.txt b/requirements-swh.txt --- a/requirements-swh.txt +++ b/requirements-swh.txt @@ -2,5 +2,5 @@ swh.model >= 0.0.15 swh.objstorage >= 0.0.43 swh.scheduler >= 0.0.47 -swh.storage >= 0.0.156 +swh.storage >= 0.0.189 swh.journal >= 0.0.31 diff --git a/swh/indexer/tests/test_origin_head.py b/swh/indexer/tests/test_origin_head.py --- a/swh/indexer/tests/test_origin_head.py +++ b/swh/indexer/tests/test_origin_head.py @@ -4,7 +4,7 @@ # See top-level LICENSE file for more information import unittest -from datetime import datetime +from datetime import datetime, timezone from swh.indexer.origin_head import OriginHeadIndexer from swh.indexer.tests.utils import BASE_TEST_CONFIG, fill_storage @@ -54,7 +54,7 @@ {"url": origin_url,} ) visit = self.indexer.storage.origin_visit_add( - origin_url, datetime(2019, 2, 27), type="git", + origin_url, datetime(2019, 2, 27, tzinfo=timezone.utc), type="git" ) self.indexer.storage.snapshot_add( [ @@ -86,7 +86,7 @@ {"url": origin_url,} ) visit = self.indexer.storage.origin_visit_add( - origin_url, datetime(2019, 2, 27), type="pypi" + origin_url, datetime(2019, 2, 27, tzinfo=timezone.utc), type="pypi" ) self.indexer.storage.snapshot_add( [ diff --git a/swh/indexer/tests/utils.py b/swh/indexer/tests/utils.py --- a/swh/indexer/tests/utils.py +++ b/swh/indexer/tests/utils.py @@ -4,7 +4,6 @@ # See top-level LICENSE file for more information import abc -import datetime import functools import random from typing import Dict, Any @@ -16,6 +15,8 @@ from swh.model.hashutil import hash_to_bytes, hash_to_hex from swh.indexer.storage import INDEXER_CFG_KEY +from swh.storage.utils import now + BASE_TEST_CONFIG: Dict[str, Dict[str, Any]] = { "storage": {"cls": "pipeline", "steps": [{"cls": "validate"}, {"cls": "memory"},]}, @@ -507,7 +508,7 @@ for snap in SNAPSHOTS: origin_url = snap["origin"] visit = storage.origin_visit_add( - origin_url, date=datetime.datetime.now(), type=visit_types[origin_url] + origin_url, date=now(), type=visit_types[origin_url] ) snap_id = snap.get("id") or bytes([random.randint(0, 255) for _ in range(32)]) storage.snapshot_add([{"id": snap_id, "branches": snap["branches"]}])