t

openWB · Nov 14, 2023 · b11bc49 · b11bc49
1 parent b6ed3dc
commit b11bc49
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/packages/conftest.py b/packages/conftest.py
@@ -2,7 +2,7 @@
 from unittest.mock import MagicMock, Mock
 import pytest
 
-from helpermodules import pub
+from helpermodules import pub, timecheck
 
 
 @pytest.fixture(autouse=True)
@@ -12,6 +12,8 @@ def mock_today(monkeypatch) -> None:
     # Zeitzonen GitHub: UTC, Raspberry: Europe/Berlin
     datetime_mock.today.return_value = datetime.datetime(2022, 5, 16, 8, 40, 52)
     monkeypatch.setattr(datetime, "datetime", datetime_mock)
+    mock_today_timestamp = Mock(return_value=1652683252)
+    monkeypatch.setattr(timecheck, "create_timestamp", mock_today_timestamp)
 
 
 @pytest.fixture(autouse=True)

diff --git a/packages/control/auto_phase_switch_test.py b/packages/control/auto_phase_switch_test.py
@@ -108,7 +108,7 @@ def __init__(self,
            expected_timestamp_auto_phase_switch=1652683252.0,
            expected_state=ChargepointState.PHASE_SWITCH_DELAY),
     Params("3to1, enough power, timer not expired", max_current_single_phase=16,
-           timestamp_auto_phase_switch="05/16/2022, 08:35:52", phases_to_use=3, required_current=6,
+           timestamp_auto_phase_switch=1652682952.0, phases_to_use=3, required_current=6,
            evu_surplus=-860, reserved_evu_overhang=0, get_currents=[4.5, 4.4, 5.8],
            get_power=3381, state=ChargepointState.PHASE_SWITCH_DELAY, expected_phases_to_use=3, expected_current=6,
            expected_message=f"Umschaltverzögerung von 3 auf 1 Phasen abgebrochen{Ev.ENOUGH_POWER}",

diff --git a/packages/helpermodules/timecheck.py b/packages/helpermodules/timecheck.py
@@ -227,7 +227,7 @@ def check_timestamp(timestamp: int, duration: int) -> bool:
     True: Zeit ist noch nicht abgelaufen
     False: Zeit ist abgelaufen
     """
-    if (datetime.datetime.today().timestamp() - duration) > timestamp:
+    if (create_timestamp() - duration) > timestamp:
         return False
     else:
         return True
@@ -277,4 +277,4 @@ def convert_timedelta_to_time_string(timedelta_obj: datetime.timedelta) -> str:
 
 
 def get_difference_to_now(timestamp_begin: float) -> float:
-    return datetime.datetime.today().timestamp() - timestamp_begin
+    return create_timestamp() - timestamp_begin