From ddff6522fa72aacc7475ba5cd4bf8683ff12b8c7 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sun, 13 Oct 2013 11:54:11 +0200 Subject: [1.6.x] Fixed #19560 -- Identified field in warning for naive datetime. Thanks gcc for the report and vajrasky for the patch. Backport of 570d9c2678d6cc564f9c70138554af8f7ce9ec49 from master. --- tests/timezones/tests.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/timezones/tests.py b/tests/timezones/tests.py index 43f41ea7fb..6a011c9aff 100644 --- a/tests/timezones/tests.py +++ b/tests/timezones/tests.py @@ -275,7 +275,8 @@ class NewDatabaseTests(TestCase): Event.objects.create(dt=dt) self.assertEqual(len(recorded), 1) msg = str(recorded[0].message) - self.assertTrue(msg.startswith("DateTimeField received a naive datetime")) + self.assertTrue(msg.startswith("DateTimeField Event.dt received " + "a naive datetime")) event = Event.objects.get() # naive datetimes are interpreted in local time self.assertEqual(event.dt, dt.replace(tzinfo=EAT)) @@ -288,7 +289,8 @@ class NewDatabaseTests(TestCase): Event.objects.create(dt=dt) self.assertEqual(len(recorded), 1) msg = str(recorded[0].message) - self.assertTrue(msg.startswith("DateTimeField received a naive datetime")) + self.assertTrue(msg.startswith("DateTimeField Event.dt received " + "a naive datetime")) event = Event.objects.get() self.assertEqual(event.dt, datetime.datetime(2011, 9, 1, tzinfo=EAT)) @@ -301,7 +303,8 @@ class NewDatabaseTests(TestCase): Event.objects.create(dt=dt) self.assertEqual(len(recorded), 1) msg = str(recorded[0].message) - self.assertTrue(msg.startswith("DateTimeField received a naive datetime")) + self.assertTrue(msg.startswith("DateTimeField Event.dt received " + "a naive datetime")) event = Event.objects.get() # naive datetimes are interpreted in local time self.assertEqual(event.dt, dt.replace(tzinfo=EAT)) @@ -315,7 +318,8 @@ class NewDatabaseTests(TestCase): Event.objects.create(dt=dt) self.assertEqual(len(recorded), 1) msg = str(recorded[0].message) - self.assertTrue(msg.startswith("DateTimeField received a naive datetime")) + self.assertTrue(msg.startswith("DateTimeField Event.dt received " + "a naive datetime")) event = Event.objects.get() # microseconds are lost during a round-trip in the database # naive datetimes are interpreted in local time @@ -402,7 +406,8 @@ class NewDatabaseTests(TestCase): self.assertEqual(len(recorded), 3) for warning in recorded: msg = str(warning.message) - self.assertTrue(msg.startswith("DateTimeField received a naive datetime")) + self.assertTrue(msg.startswith("DateTimeField Event.dt " + "received a naive datetime")) @skipUnlessDBFeature('has_zoneinfo_database') def test_query_datetime_lookups(self): -- cgit v1.3