Merge branch 'master' into dev-greg

1 files changed, 22 insertions, 20 deletions

diff --git a/tests/models/thl/test_wall.py b/tests/models/thl/test_wall.py
index 8398c81..61ca11d 100644
--- a/tests/models/thl/test_wall.py
+++ b/tests/models/thl/test_wall.py
@@ -1,11 +1,13 @@
-from datetime import datetime, timedelta, timezone
+from __future__ import annotations
+
+from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 from uuid import uuid4
 
 import pytest
 from pydantic import ValidationError
 
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.definitions import (
     Status,
     StatusCode1,
@@ -27,8 +29,8 @@ class TestWall:
             ext_status_code_1="1.0",
             status=Status.FAIL,
             status_code_1=StatusCode1.BUYER_FAIL,
-            started=datetime(2023, 1, 1, 0, 0, 1, tzinfo=timezone.utc),
-            finished=datetime(2023, 1, 1, 0, 10, 1, tzinfo=timezone.utc),
+            started=datetime(2023, 1, 1, 0, 0, 1, tzinfo=UTC),
+            finished=datetime(2023, 1, 1, 0, 10, 1, tzinfo=UTC),
         )
         s = w.to_json()
         w2 = Wall.from_json(s)
@@ -45,8 +47,8 @@ class TestWall:
             survey_id="yyy",
             status=Status.FAIL,
             status_code_1=StatusCode1.BUYER_FAIL,
-            started=datetime.now(timezone.utc),
-            finished=datetime.now(timezone.utc) + timedelta(seconds=1),
+            started=datetime.now(UTC),
+            finished=datetime.now(UTC) + timedelta(seconds=1),
         )
         Wall(
             user_id=1,
@@ -58,8 +60,8 @@ class TestWall:
             status=Status.FAIL,
             status_code_1=StatusCode1.MARKETPLACE_FAIL,
             status_code_2=WallStatusCode2.COMPLETE_TOO_FAST,
-            started=datetime.now(timezone.utc),
-            finished=datetime.now(timezone.utc) + timedelta(seconds=1),
+            started=datetime.now(UTC),
+            finished=datetime.now(UTC) + timedelta(seconds=1),
         )
         with pytest.raises(expected_exception=ValidationError) as e:
             Wall(
@@ -71,8 +73,8 @@ class TestWall:
                 survey_id="yyy",
                 status=Status.FAIL,
                 status_code_1=StatusCode1.GRS_ABANDON,
-                started=datetime.now(timezone.utc),
-                finished=datetime.now(timezone.utc) + timedelta(seconds=1),
+                started=datetime.now(UTC),
+                finished=datetime.now(UTC) + timedelta(seconds=1),
             )
         assert "If status is f, status_code_1 should be in" in str(e.value)
 
@@ -87,8 +89,8 @@ class TestWall:
                 status=Status.FAIL,
                 status_code_1=StatusCode1.GRS_ABANDON,
                 status_code_2=WallStatusCode2.COMPLETE_TOO_FAST,
-                started=datetime.now(timezone.utc),
-                finished=datetime.now(timezone.utc) + timedelta(seconds=1),
+                started=datetime.now(UTC),
+                finished=datetime.now(UTC) + timedelta(seconds=1),
             )
         assert "If status is f, status_code_1 should be in" in str(e.value)
 
@@ -104,8 +106,8 @@ class TestWall:
             status=Status.FAIL,
             status_code_1=StatusCode1.MARKETPLACE_FAIL,
             status_code_2=WallStatusCode2.COMPLETE_TOO_FAST,
-            started=datetime.now(timezone.utc),
-            finished=datetime.now(timezone.utc) + timedelta(seconds=1),
+            started=datetime.now(UTC),
+            finished=datetime.now(UTC) + timedelta(seconds=1),
         )
         Wall(
             user_id=1,
@@ -117,8 +119,8 @@ class TestWall:
             status=Status.FAIL,
             status_code_1=StatusCode1.BUYER_FAIL,
             status_code_2=None,
-            started=datetime.now(timezone.utc),
-            finished=datetime.now(timezone.utc) + timedelta(seconds=1),
+            started=datetime.now(UTC),
+            finished=datetime.now(UTC) + timedelta(seconds=1),
         )
         Wall(
             user_id=1,
@@ -130,8 +132,8 @@ class TestWall:
             status=Status.COMPLETE,
             status_code_1=StatusCode1.COMPLETE,
             status_code_2=None,
-            started=datetime.now(timezone.utc),
-            finished=datetime.now(timezone.utc) + timedelta(seconds=1),
+            started=datetime.now(UTC),
+            finished=datetime.now(UTC) + timedelta(seconds=1),
         )
 
         with pytest.raises(expected_exception=ValidationError) as e:
@@ -145,8 +147,8 @@ class TestWall:
                 status=Status.FAIL,
                 status_code_1=StatusCode1.BUYER_FAIL,
                 status_code_2=WallStatusCode2.COMPLETE_TOO_FAST,
-                started=datetime.now(timezone.utc),
-                finished=datetime.now(timezone.utc) + timedelta(seconds=1),
+                started=datetime.now(UTC),
+                finished=datetime.now(UTC) + timedelta(seconds=1),
             )
             assert "If status_code_1 is 1, status_code_2 should be in" in str(e.value)