Skip to content

Commit

Permalink
fix datetime in integration tests
Browse files Browse the repository at this point in the history
  • Loading branch information
djbrown authored Mar 26, 2024
1 parent 008c04e commit 52d17e6
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
6 changes: 4 additions & 2 deletions src/base/tests/integration/test_correct_data.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import datetime

from django.utils import timezone

from base.tests.base import IntegrationTestCase
from games.models import Game
from leagues.models import League
Expand All @@ -17,7 +19,7 @@ def test_game_210116_sghh_hcn(self):
game = self.assert_objects(Game)

self.assertEqual(game.number, 210116)
self.assertEqual(game.opening_whistle, datetime.datetime(2018, 2, 18, 17, 30))
self.assertEqual(game.opening_whistle, timezone.make_aware(datetime.datetime(2018, 2, 18, 17, 30)))
self.assertEqual(game.home_team.short_name, 'SG Heidel/Helm')
self.assertEqual(game.guest_team.short_name, 'HC Neuenbürg')
self.assertEqual(game.home_goals, 29)
Expand All @@ -42,7 +44,7 @@ def test_game_96781(self):
game = self.assert_objects(Game)

self.assertEqual(game.number, 96781)
self.assertEqual(game.opening_whistle, datetime.datetime(2019, 9, 14, 19, 00))
self.assertEqual(game.opening_whistle, timezone.make_aware(datetime.datetime(2019, 9, 14, 19, 00)))
self.assertEqual(game.home_team.short_name, 'TV Weingarten')
self.assertEqual(game.guest_team.short_name, 'SG Argental')
self.assertEqual(game.home_goals, 19)
Expand Down
5 changes: 3 additions & 2 deletions src/games/tests/integration/test_import_games.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from pathlib import Path

from django.conf import settings
from django.utils import timezone

from base import logic, parsing
from base.tests.base import IntegrationTestCase
Expand All @@ -25,7 +26,7 @@ def test_specific(self):

self.assertEqual(game.number, 210226)
self.assertEqual(game.league, league)
self.assertEqual(game.opening_whistle, datetime.datetime(2017, 10, 7, 19, 45))
self.assertEqual(game.opening_whistle, timezone.make_aware(datetime.datetime(2017, 10, 7, 19, 45)))
self.assertEqual(game.sports_hall.number, 22010)
self.assertEqual(game.sports_hall.bhv_id, 487)
self.assertEqual(game.home_team.short_name, 'TSVG Malsch')
Expand Down Expand Up @@ -94,7 +95,7 @@ def test_update_game(self):

game = self.assert_objects(Game)

self.assertEqual(game.opening_whistle, datetime.datetime(2017, 10, 8, 15, 0))
self.assertEqual(game.opening_whistle, timezone.make_aware(datetime.datetime(2017, 10, 8, 15, 0)))
self.assertEqual(game.home_goals, 124)
self.assertEqual(game.guest_goals, 122)
self.assertEqual(game.report_number, 0)
Expand Down
5 changes: 3 additions & 2 deletions src/teams/views.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
from datetime import datetime, timedelta
from datetime import timedelta
from enum import Enum, auto

from django.db.models import Count, F, Q, Sum
from django.db.models.functions import Coalesce
from django.http import HttpResponse
from django.shortcuts import get_object_or_404, render
from django.utils import timezone
from icalendar import Calendar, Event, vText
from returns.result import Result

Expand Down Expand Up @@ -111,7 +112,7 @@ def _create_event(team: Team, game: Game) -> Result[Event, ErrCode]:

start = game.opening_whistle
end = start + timedelta(minutes=90)
dtstamp = datetime.now()
dtstamp = timezone.now()
location = game.sports_hall.address if game.sports_hall else None
uid = f'game/{game.number}@hbscorez.de'

Expand Down

0 comments on commit 52d17e6

Please sign in to comment.