aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2023-03-04 13:10:37 +0100
committerMartin Polden <mpolden@mpolden.no>2023-03-04 13:25:20 +0100
commitad1013dd5e1f6bf93b63ff5e6e2a4d9c17fc44fd (patch)
tree41f82f5ece968164cb7cd9e5b1d4326f9b4242ea
parent76d580e19ead7162b5622e1c74649a15f1c38816 (diff)
vaernesekspressen: simplify and fix test
-rw-r--r--jarvis/jobs/vaernesekspressen.py5
-rwxr-xr-xjarvis/tests.py3
2 files changed, 4 insertions, 4 deletions
diff --git a/jarvis/jobs/vaernesekspressen.py b/jarvis/jobs/vaernesekspressen.py
index 455437b..da19d24 100644
--- a/jarvis/jobs/vaernesekspressen.py
+++ b/jarvis/jobs/vaernesekspressen.py
@@ -3,7 +3,7 @@
import json
import requests
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
from jobs import AbstractJob
@@ -51,8 +51,7 @@ class Vaernesekspressen(AbstractJob):
r.raise_for_status()
departures = []
for d in r.json():
- time = f"{today} {d['time']}"
- departure_time = datetime.strptime(time, "%Y-%m-%d %H:%M:%S")
+ departure_time = datetime.fromisoformat(f"{today}T{d['time']}")
departure = {
"stop_name": stop_name,
"destination_name": "Trondheim lufthavn",
diff --git a/jarvis/tests.py b/jarvis/tests.py
index 27c9edc..163c375 100755
--- a/jarvis/tests.py
+++ b/jarvis/tests.py
@@ -457,7 +457,8 @@ class Vaernesekspressen(unittest.TestCase):
f.now = lambda: datetime(2020, 2, 1, 10)
data = f.get()
self.assertEqual(13, len(data["departures"]))
- self.assertEqual(1580554800, data["departures"][0]["departure_time"])
+ utcoffset = datetime.now().astimezone().utcoffset().seconds
+ self.assertEqual(1580558400 - utcoffset, data["departures"][0]["departure_time"])
self.assertEqual("Solsiden", data["departures"][0]["stop_name"])
self.assertEqual("Trondheim lufthavn", data["to"])