- tighten mysql date test to not fail over 1 second boundaries (and probably microsec...

diff --git a/test/dialect/test_mysql.py b/test/dialect/test_mysql.py
index 2a3ffe7c46de1c09920f6099cff33a988c0aaf5a..4a2fcfb9433a881afc48f70b9b127dde47f27c58 100644 (file)
--- a/test/dialect/test_mysql.py
+++ b/test/dialect/test_mysql.py
@@ -578,34 +578,35 @@ class TypesTest(fixtures.TestBase, AssertsExecutionResults, AssertsCompiledSQL):
         finally:
             meta.drop_all()
 
+    @testing.provide_metadata
     def test_timestamp_nullable(self):
-        meta = MetaData(testing.db)
-        ts_table = Table('mysql_timestamp', meta,
+        ts_table = Table('mysql_timestamp', self.metadata,
                             Column('t1', TIMESTAMP),
                             Column('t2', TIMESTAMP, nullable=False),
                     )
-        meta.create_all()
-        try:
-            # there's a slight assumption here that this test can
-            # complete within the scope of a single second.
-            # if needed, can break out the eq_() just to check for
-            # timestamps that are within a few seconds of "now"
-            # using timedelta.
-
-            now = testing.db.execute("select now()").scalar()
-
-            # TIMESTAMP without NULL inserts current time when passed
-            # NULL.  when not passed, generates 0000-00-00 quite
-            # annoyingly.
-            ts_table.insert().execute({'t1':now, 't2':None})
-            ts_table.insert().execute({'t1':None, 't2':None})
-
-            eq_(
-                ts_table.select().execute().fetchall(),
-                [(now, now), (None, now)]
-            )
-        finally:
-            meta.drop_all()
+        self.metadata.create_all()
+
+        now = testing.db.execute("select now()").scalar()
+
+        # TIMESTAMP without NULL inserts current time when passed
+        # NULL.  when not passed, generates 0000-00-00 quite
+        # annoyingly.
+        ts_table.insert().execute({'t1': now, 't2': None})
+        ts_table.insert().execute({'t1': None, 't2': None})
+
+        # normalize dates that are over the second boundary
+        def normalize(dt):
+            if dt is None:
+                return None
+            elif (dt - now).seconds < 5:
+                return now
+            else:
+                return dt
+        eq_(
+            [tuple([normalize(dt) for dt in row])
+            for row in ts_table.select().execute()],
+            [(now, now), (None, now)]
+        )
 
     def test_year(self):
         """Exercise YEAR."""