transplants: mv CODE_FREEZE_OFFSET and test codefreeze_datetime (#220)

move CODE_FREEZE_OFFSET to top-level constant and add tests for mock datetime module

Author: grottohub

landoapi/models/revisions.py

@@ -51,11 +51,6 @@ class DiffWarning(Base):
     # The "type" of warning. This is mainly to group warnings when querying the API.
     group = db.Column(db.Enum(DiffWarningGroup), nullable=False)
 
-    # The code freeze dates generally correspond to PST work days.
-    @property
-    def code_freeze_offset(self) -> str:
-        return "-0800"
-
     def serialize(self):
         """Return a JSON serializable dictionary."""
         return {

landoapi/transplants.py

@@ -1,4 +1,4 @@
-# This Source Code Form is subject to the terms of the Mozilla Publc
+# This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 import functools
@@ -41,6 +41,9 @@
     defaults=(None, None, None, None, False),
 )
 
+# The code freeze dates generally correspond to PST work days.
+CODE_FREEZE_OFFSET = "-0800"
+
 
 def tokens_are_equal(t1, t2):
     """Return whether t1 and t2 are equal.
@@ -330,14 +333,14 @@ def warning_code_freeze(*, repo, **kwargs):
 
     today = datetime.now(tz=timezone.utc)
     freeze_date = datetime.strptime(
-        f"{freeze_date_str} {DiffWarning.code_freeze_offset}",
+        f"{freeze_date_str} {CODE_FREEZE_OFFSET}",
         "%Y-%m-%d %z",
     ).replace(tzinfo=timezone.utc)
     if today < freeze_date:
         return
 
     merge_date = datetime.strptime(
-        f"{merge_date_str} {DiffWarning.code_freeze_offset}",
+        f"{merge_date_str} {CODE_FREEZE_OFFSET}",
         "%Y-%m-%d %z",
     ).replace(tzinfo=timezone.utc)
 

tests/conftest.py

@@ -23,7 +23,6 @@
 from landoapi.app import construct_app, load_config, SUBSYSTEMS
 from landoapi.cache import cache, cache_subsystem
 from landoapi.mocks.auth import MockAuth0, TEST_JWKS
-from landoapi.models.revisions import DiffWarning
 from landoapi.phabricator import PhabricatorClient
 from landoapi.projects import (
     CHECKIN_PROJ_SLUG,
@@ -34,7 +33,7 @@
 from landoapi.repos import Repo, SCM_LEVEL_3
 from landoapi.storage import db as _db, db_subsystem
 from landoapi.tasks import celery
-from landoapi.transplants import tokens_are_equal
+from landoapi.transplants import tokens_are_equal, CODE_FREEZE_OFFSET
 
 from tests.factories import TransResponseFactory
 from tests.mocks import PhabricatorDouble, TreeStatusDouble
@@ -446,7 +445,7 @@ def register_codefreeze_uri(request_mocker):
 
 @pytest.fixture
 def codefreeze_datetime(request_mocker):
-    utc_offset = DiffWarning.code_freeze_offset
+    utc_offset = CODE_FREEZE_OFFSET
     dates = {
         "today": datetime(2000, 1, 5, 0, 0, 0, tzinfo=timezone.utc),
         f"two_days_ago {utc_offset}": datetime(2000, 1, 3, 0, 0, 0),

tests/test_transplants.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 import os
+from datetime import datetime, timezone
 from unittest.mock import MagicMock
 
 import pytest
@@ -1061,3 +1062,9 @@ def _create_transplant(
     db.session.add(transplant)
     db.session.commit()
     return transplant
+
+
+def test_codefreeze_datetime_mock(codefreeze_datetime):
+    dt = codefreeze_datetime()
+    assert dt.now(tz=timezone.utc) == datetime(2000, 1, 5, 0, 0, 0, tzinfo=timezone.utc)
+    assert dt.strptime("tomorrow -0800", fmt="") == datetime(2000, 1, 6, 0, 0, 0)