Add tests for new properties

Also simplifies the loading of mock response in api status test,
and adds missing requirement to setup.py

Author: dericke

overpass/api.py

@@ -7,7 +7,7 @@
 import json
 import logging
 import re
-from datetime import datetime
+from datetime import datetime, timezone
 from io import StringIO
 from math import ceil
 from typing import Optional
@@ -217,9 +217,14 @@ def slot_available_countdown(self) -> int:
         :returns: 0 if a slot is available now, or an int of seconds until the next slot is free
         """
         try:
-            return ceil(
-                (self.slot_available_datetime -
-                 datetime.now().astimezone()).total_seconds()
+            return max(
+                ceil(
+                    (
+                        self.slot_available_datetime -
+                        datetime.now(timezone.utc)
+                    ).total_seconds()
+                ),
+                0
             )
         except TypeError:
             # Can't subtract from None, which means slot is available now

setup.py

@@ -20,5 +20,5 @@
         "Topic :: Utilities",
     ],
     install_requires=["requests>=2.3.0", "geojson>=1.0.9", "shapely>=1.6.4"],
-    extras_require={"test": ["pytest"]},
+    extras_require={"test": ["pytest", "requests-mock[fixture]"]},
 )

tests/test_api.py

@@ -90,13 +90,13 @@ def test_geojson_live():
     "response,slots_available,slots_running,slots_waiting",
     [
         (
-            "tests/overpass_status/no_slots_waiting.txt",
+            Path("tests/overpass_status/no_slots_waiting.txt"),
             2,
             (),
             ()
         ),
         (
-            "tests/overpass_status/one_slot_running.txt",
+            Path("tests/overpass_status/one_slot_running.txt"),
             1,
             (
                 datetime(
@@ -112,7 +112,7 @@ def test_geojson_live():
             ()
         ),
         (
-            "tests/overpass_status/one_slot_waiting.txt",
+            Path("tests/overpass_status/one_slot_waiting.txt"),
             1,
             (),
             (
@@ -128,7 +128,7 @@ def test_geojson_live():
             )
         ),
         (
-            "tests/overpass_status/two_slots_waiting.txt",
+            Path("tests/overpass_status/two_slots_waiting.txt"),
             0,
             (),
             (
@@ -154,9 +154,8 @@ def test_geojson_live():
         ),
     ]
 )
-def test_api_status(response, slots_available, slots_running, slots_waiting, requests_mock):
-    with open(response) as fp:
-        mock_response = fp.read()
+def test_api_status(response: Path, slots_available: int, slots_running: tuple[datetime], slots_waiting: tuple[datetime], requests_mock):
+    mock_response = response.read_text()
     requests_mock.get("https://overpass-api.de/api/status", text=mock_response)
 
     api = overpass.API(debug=True)
@@ -175,3 +174,8 @@ def test_api_status(response, slots_available, slots_running, slots_waiting, req
 
     assert isinstance(api.slots_waiting, tuple)
     assert api.slots_waiting == slots_waiting
+
+    assert isinstance(api.slot_available_countdown, int)
+    assert api.slot_available_countdown >= 0
+
+    assert api.slot_available_datetime is None or isinstance(api.slot_available_datetime, datetime)