Page MenuHomeSoftware Heritage
Files F9125554

D5909.id21203.diff
No OneTemporary
Actions

D5909.id21203.diff
View Options

diff --git a/swh/counters/tests/test_journal_client.py b/swh/counters/tests/test_journal_client.py
--- a/swh/counters/tests/test_journal_client.py
+++ b/swh/counters/tests/test_journal_client.py
@@ -34,13 +34,6 @@
)
-def _get_processing_method_mocks(mocker):
- return {
- message_type: mocker.patch(PROCESSING_METHODS[message_type])
- for message_type in PROCESSING_METHODS.keys()
- }
-
-
def _create_release(author_fullname: Optional[str]) -> Dict:
"""Use Release.to_dict to be sure the field's name used to retrieve
the author is correct"""
@@ -110,11 +103,8 @@
REVISIONS_PERSON_FULLNAMES = REVISIONS_AUTHOR_FULLNAMES | REVISIONS_COMMITTER_FULLNAMES
-def test__journal_client__all_keys(mocker):
-
- mock = mocker.patch("swh.counters.redis.Redis.add")
-
- redis = Redis(host="localhost")
+def test_journal_client_all_keys(local_redis_host):
+ redis = Redis(host=local_redis_host)
keys = {
"coll1": {b"key1": b"value1", b"key2": b"value2"},
@@ -123,46 +113,30 @@
process_journal_messages(messages=keys, counters=redis)
- assert mock.call_count == 2
-
- first_call_args = mock.call_args_list[0]
- assert first_call_args[0][0] == "coll1"
- assert first_call_args[0][1] == keys["coll1"]
+ assert redis.get_counts(redis.get_counters()) == {b"coll1": 2, b"coll2": 3}
- second_call_args = mock.call_args_list[1]
- assert second_call_args[0][0] == "coll2"
- assert second_call_args[0][1] == keys["coll2"]
-
-def test__journal_client_process_revisions(mocker):
- mock = mocker.patch("swh.counters.redis.Redis.add")
-
- redis = Redis(host="localhost")
+def test_journal_client_process_revisions(local_redis_host):
+ redis = Redis(host=local_redis_host)
process_revisions(REVISIONS, redis)
- assert mock.call_count == 1
- first_call_args = mock.call_args_list[0]
- assert first_call_args[0][0] == "person"
- assert sorted(first_call_args[0][1]) == sorted(REVISIONS_PERSON_FULLNAMES)
-
+ assert redis.get_counts(redis.get_counters()) == {
+ b"person": len(REVISIONS_PERSON_FULLNAMES)
+ }
-def test__journal_client_process_releases(mocker):
- mock = mocker.patch("swh.counters.redis.Redis.add")
- redis = Redis(host="localhost")
+def test_journal_client_process_releases(local_redis_host):
+ redis = Redis(host=local_redis_host)
process_releases(RELEASES, redis)
- assert mock.call_count == 1
- first_call_args = mock.call_args_list[0]
- assert first_call_args[0][0] == "person"
- assert first_call_args[0][1] == list(RELEASES_AUTHOR_FULLNAMES)
-
+ assert redis.get_counts(redis.get_counters()) == {
+ b"person": len(RELEASES_AUTHOR_FULLNAMES)
+ }
-def test__journal_client_process_releases_without_authors(mocker):
- mock = mocker.patch("swh.counters.redis.Redis.add")
+def test_journal_client_process_releases_without_authors(local_redis_host):
releases = {
rel["id"]: msgpack.dumps(rel)
for rel in [
@@ -171,11 +145,8 @@
]
}
- redis = Redis(host="localhost")
+ redis = Redis(host=local_redis_host)
process_releases(releases, redis)
- assert mock.called == 1
- first_call_args = mock.call_args_list[0]
- assert first_call_args[0][0] == "person"
- assert first_call_args[0][1] == []
+ assert redis.get_counts(redis.get_counters()) == {}

File Metadata

Mime Type
text/plain
Expires
Fri, Jun 20, 9:03 PM (4 w, 1 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3233054

Event Timeline

About · Developer information · Legal