Skip to content

Commit 611d732

Browse files
test: fix a couple tz problems in tests run soon after midnight UTC (ietf-tools#4757)
* test: fix tz problem in test_document_ballot() test * test: fix tz problem in IprTests.test_notify() test Co-authored-by: Robert Sparks <rjsparks@nostrum.com>
1 parent cfda989 commit 611d732

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

ietf/doc/tests.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1646,7 +1646,13 @@ def test_document_ballot(self):
16461646
doc.save_with_history([e])
16471647
r = self.client.get(urlreverse("ietf.doc.views_doc.document_ballot", kwargs=dict(name=doc.name)))
16481648
self.assertEqual(r.status_code, 200)
1649-
self.assertRegex(r.content.decode(), r'\(\s*%s\s+for\s+-%s\s*\)' % (pos.comment_time.strftime('%Y-%m-%d'), oldrev))
1649+
self.assertRegex(
1650+
r.content.decode(),
1651+
r'\(\s*%s\s+for\s+-%s\s*\)' % (
1652+
pos.comment_time.astimezone(ZoneInfo(settings.TIME_ZONE)).strftime('%Y-%m-%d'),
1653+
oldrev,
1654+
)
1655+
)
16501656

16511657
# Now simulate a new ballot against the new revision and make sure the "was" position is included
16521658
pos2 = BallotPositionDocEvent.objects.create(

ietf/ipr/tests.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,10 @@ def test_notify(self):
578578
self.assertIn('posted on '+date_today().strftime("%Y-%m-%d"), get_payload_text(outbox[len_before]).replace('\n',' '))
579579
self.assertTrue('draft-ietf-mars-test@ietf.org' in outbox[len_before+1]['To'])
580580
self.assertTrue('mars-wg@ietf.org' in outbox[len_before+1]['Cc'])
581-
self.assertIn('Secretariat on '+ipr.get_latest_event_submitted().time.strftime("%Y-%m-%d"), get_payload_text(outbox[len_before+1]).replace('\n',' '))
581+
self.assertIn(
582+
'Secretariat on ' + ipr.get_latest_event_submitted().time.astimezone(ZoneInfo(settings.TIME_ZONE)).strftime("%Y-%m-%d"),
583+
get_payload_text(outbox[len_before + 1]).replace('\n', ' ')
584+
)
582585
self.assertIn(f'{settings.IDTRACKER_BASE_URL}{urlreverse("ietf.ipr.views.showlist")}', get_payload_text(outbox[len_before]).replace('\n',' '))
583586
self.assertIn(f'{settings.IDTRACKER_BASE_URL}{urlreverse("ietf.ipr.views.history",kwargs=dict(id=ipr.pk))}', get_payload_text(outbox[len_before+1]).replace('\n',' '))
584587

0 commit comments

Comments
 (0)