sts-sponsors team mailing list archive

[Alberto Donato <mp+435951@xxxxxxxxxxxxxxxxxx>]

Alberto Donato has proposed merging ~ack/maas:sampledata-different-created-updated into maas:master.

Commit message:
sampledata: different created/updated timestamps for events and tags



Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~ack/maas/+git/maas/+merge/435951
-- 
Your team MAAS Maintainers is requested to review the proposed merge of ~ack/maas:sampledata-different-created-updated into maas:master.

diff --git a/src/maasserver/testing/sampledata/event.py b/src/maasserver/testing/sampledata/event.py
index e449cf0..eff17c3 100644
--- a/src/maasserver/testing/sampledata/event.py
+++ b/src/maasserver/testing/sampledata/event.py
@@ -24,16 +24,19 @@ def make_events(
     machines: Iterable[Machine],
 ):
     event_types = cycle(event_types)
-    now = datetime.utcnow()
+    events = []
     for machine in machines:
-        Event.objects.bulk_create(
-            Event(
-                type=next(event_types),
-                node=machine,
-                action=make_name(),
-                description=make_name(),
-                created=now,
-                updated=now,
+        for _ in range(next(counts)):
+            now = datetime.utcnow()
+            events.append(
+                Event(
+                    type=next(event_types),
+                    node=machine,
+                    action=make_name(),
+                    description=make_name(),
+                    created=now,
+                    updated=now,
+                )
             )
-            for _ in range(next(counts))
-        )
+
+    Event.objects.bulk_create(events)
diff --git a/src/maasserver/testing/sampledata/tag.py b/src/maasserver/testing/sampledata/tag.py
index da7b71c..5930271 100644
--- a/src/maasserver/testing/sampledata/tag.py
+++ b/src/maasserver/testing/sampledata/tag.py
@@ -7,12 +7,14 @@ from .common import range_one
 
 
 def make_tags(count: int, prefix: str) -> List[Tag]:
-    now = datetime.utcnow()
-    return Tag.objects.bulk_create(
-        Tag(
-            name=f"{prefix}{n:03}",
-            created=now,
-            updated=now,
+    tags = []
+    for n in range_one(count):
+        now = datetime.utcnow()
+        tags.append(
+            Tag(
+                name=f"{prefix}{n:03}",
+                created=now,
+                updated=now,
+            )
         )
-        for n in range_one(count)
-    )
+    return Tag.objects.bulk_create(tags)