From 401bc17def41c8e712e2d7d71b7e533d52d3afbc Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont (@ardumont)" <antoine.romain.dumont@gmail.com>
Date: Fri, 10 Apr 2020 10:43:20 +0200
Subject: [PATCH] model: Rename OriginVisitUpdate to OriginVisitStatus
This also adapts the hypothesis strategies, using the plural form
origin_visit_statuses. That plural form is acceptable because in our context,
the statuses are countable.
Related to T2310
---
swh/model/hypothesis_strategies.py | 10 +++++-----
swh/model/model.py | 2 +-
swh/model/tests/test_model.py | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/swh/model/hypothesis_strategies.py b/swh/model/hypothesis_strategies.py
index a66efdc1..f5dbe26e 100644
--- a/swh/model/hypothesis_strategies.py
+++ b/swh/model/hypothesis_strategies.py
@@ -32,7 +32,7 @@ from .model import (
TimestampWithTimezone,
Origin,
OriginVisit,
- OriginVisitUpdate,
+ OriginVisitStatus,
Snapshot,
SnapshotBranch,
ObjectType,
@@ -153,7 +153,7 @@ def metadata_dicts():
return dictionaries(pgsql_text(), pgsql_text())
-def origin_visit_updates_d():
+def origin_visit_statuses_d():
return builds(
dict,
visit=integers(0, 1000),
@@ -165,8 +165,8 @@ def origin_visit_updates_d():
)
-def origin_visit_updates():
- return origin_visit_updates_d().map(OriginVisitUpdate.from_dict)
+def origin_visit_statuses():
+ return origin_visit_statuses_d().map(OriginVisitStatus.from_dict)
@composite
@@ -384,7 +384,7 @@ def objects():
return one_of(
origins().map(lambda x: ("origin", x)),
origin_visits().map(lambda x: ("origin_visit", x)),
- origin_visit_updates().map(lambda x: ("origin_visit_update", x)),
+ origin_visit_statuses().map(lambda x: ("origin_visit_update", x)),
snapshots().map(lambda x: ("snapshot", x)),
releases().map(lambda x: ("release", x)),
revisions().map(lambda x: ("revision", x)),
diff --git a/swh/model/model.py b/swh/model/model.py
index 599b06c2..74702cf4 100644
--- a/swh/model/model.py
+++ b/swh/model/model.py
@@ -243,7 +243,7 @@ class OriginVisit(BaseModel):
@attr.s(frozen=True)
-class OriginVisitUpdate(BaseModel):
+class OriginVisitStatus(BaseModel):
"""Represents a visit update of an origin at a given point in time.
"""
diff --git a/swh/model/tests/test_model.py b/swh/model/tests/test_model.py
index b65f75de..6027cc27 100644
--- a/swh/model/tests/test_model.py
+++ b/swh/model/tests/test_model.py
@@ -76,11 +76,11 @@ def test_todict_origin_visits(origin_visit):
assert origin_visit == type(origin_visit).from_dict(obj)
-@given(strategies.origin_visit_updates())
-def test_todict_origin_visit_updates(origin_visit_update):
- obj = origin_visit_update.to_dict()
+@given(strategies.origin_visit_statuses())
+def test_todict_origin_visit_statuses(origin_visit_status):
+ obj = origin_visit_status.to_dict()
- assert origin_visit_update == type(origin_visit_update).from_dict(obj)
+ assert origin_visit_status == type(origin_visit_status).from_dict(obj)
# Timestamp
--
GitLab