From 611d7328692b6596cd3df4debb0be3746bb6f2c9 Mon Sep 17 00:00:00 2001 From: Jennifer Richards Date: Tue, 15 Nov 2022 09:46:42 -0400 Subject: [PATCH] test: fix a couple tz problems in tests run soon after midnight UTC (#4757) * test: fix tz problem in test_document_ballot() test * test: fix tz problem in IprTests.test_notify() test Co-authored-by: Robert Sparks --- ietf/doc/tests.py | 8 +++++++- ietf/ipr/tests.py | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ietf/doc/tests.py b/ietf/doc/tests.py index 19e3669fb..3dffe24c7 100644 --- a/ietf/doc/tests.py +++ b/ietf/doc/tests.py @@ -1646,7 +1646,13 @@ class DocTestCase(TestCase): doc.save_with_history([e]) r = self.client.get(urlreverse("ietf.doc.views_doc.document_ballot", kwargs=dict(name=doc.name))) self.assertEqual(r.status_code, 200) - self.assertRegex(r.content.decode(), r'\(\s*%s\s+for\s+-%s\s*\)' % (pos.comment_time.strftime('%Y-%m-%d'), oldrev)) + self.assertRegex( + r.content.decode(), + r'\(\s*%s\s+for\s+-%s\s*\)' % ( + pos.comment_time.astimezone(ZoneInfo(settings.TIME_ZONE)).strftime('%Y-%m-%d'), + oldrev, + ) + ) # Now simulate a new ballot against the new revision and make sure the "was" position is included pos2 = BallotPositionDocEvent.objects.create( diff --git a/ietf/ipr/tests.py b/ietf/ipr/tests.py index 8554f74a7..a190306b1 100644 --- a/ietf/ipr/tests.py +++ b/ietf/ipr/tests.py @@ -578,7 +578,10 @@ I would like to revoke this declaration. self.assertIn('posted on '+date_today().strftime("%Y-%m-%d"), get_payload_text(outbox[len_before]).replace('\n',' ')) self.assertTrue('draft-ietf-mars-test@ietf.org' in outbox[len_before+1]['To']) self.assertTrue('mars-wg@ietf.org' in outbox[len_before+1]['Cc']) - self.assertIn('Secretariat on '+ipr.get_latest_event_submitted().time.strftime("%Y-%m-%d"), get_payload_text(outbox[len_before+1]).replace('\n',' ')) + self.assertIn( + 'Secretariat on ' + ipr.get_latest_event_submitted().time.astimezone(ZoneInfo(settings.TIME_ZONE)).strftime("%Y-%m-%d"), + get_payload_text(outbox[len_before + 1]).replace('\n', ' ') + ) self.assertIn(f'{settings.IDTRACKER_BASE_URL}{urlreverse("ietf.ipr.views.showlist")}', get_payload_text(outbox[len_before]).replace('\n',' ')) 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',' '))