From 58bcb7d1615511d34c155dedcde981b7f92df788 Mon Sep 17 00:00:00 2001
From: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Sat, 28 Jan 2012 20:34:02 +0000
Subject: [PATCH] Caught (and tested) the warning added at r17393 in the
 corresponding test. Refs #17580.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17403 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 tests/modeltests/timezones/tests.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/modeltests/timezones/tests.py b/tests/modeltests/timezones/tests.py
index 41c0016240..3954bc3392 100644
--- a/tests/modeltests/timezones/tests.py
+++ b/tests/modeltests/timezones/tests.py
@@ -264,7 +264,12 @@ class NewDatabaseTests(BaseDateTimeTests):
     @requires_tz_support
     def test_datetime_from_date(self):
         dt = datetime.date(2011, 9, 1)
-        Event.objects.create(dt=dt)
+        with warnings.catch_warnings(record=True) as recorded:
+            warnings.simplefilter('always')
+            Event.objects.create(dt=dt)
+            self.assertEqual(len(recorded), 1)
+            msg = str(recorded[0].message)
+            self.assertTrue(msg.startswith("DateTimeField received a naive datetime"))
         event = Event.objects.get()
         self.assertEqual(event.dt, datetime.datetime(2011, 9, 1, tzinfo=EAT))