Merge lp:~james-w/udd/storm-fixes into lp:udd

[James Westby]

Ensure that storm is returning datetime objects for timestamps.

Hi,

This adds a couple more storm compatibility fixes related to datetimes.

We have to manually coerce the unicode return type to a datetime for some
reason, and while doing so we have to be careful about dealing with
data inserted by sqlite3 that doesn't have any microseconds.

Thanks,

James

[Jonathan Lange (jml)]

I like. Thanks for tracking this down.

review: Approve

=== modified file 'selftest.py'
--- selftest.py	2012-03-23 16:56:38 +0000
+++ selftest.py	2012-04-04 17:18:33 +0000
@@ -47,6 +47,7 @@
                     'udd.tests.test_email_failures',
                     'udd.tests.test_graph_failures',
                     'udd.tests.test_helpers',
+                    'udd.tests.test_history_database',
                     'udd.tests.test_icommon',
                     'udd.tests.test_idb',
                     'udd.tests.test_import_list',

=== modified file 'udd/icommon.py'
--- udd/icommon.py	2012-03-23 16:56:38 +0000
+++ udd/icommon.py	2012-04-04 17:18:33 +0000
@@ -838,7 +838,10 @@
 
 
 def make_datetime(strified):
-    return datetime.strptime(strified, "%Y-%m-%d %H:%M:%S.%f")
+    fmt = "%Y-%m-%d %H:%M:%S"
+    if "." in strified:
+        fmt += ".%f"
+    return datetime.strptime(strified, fmt)
 
 
 class CommitDatabase(object):
@@ -1151,7 +1154,7 @@
         with Cursor(self.conn) as c:
             rows = c.execute("select * from %s"
                     % table)
-            return [(r[0], r[1], r[2]) for r in rows]
+            return [(make_datetime(r[0]), r[1], r[2]) for r in rows]
 
     def get_main_counts(self):
         return self._get_counts(self.MAIN_FAILED_TABLE)

=== added file 'udd/tests/test_history_database.py'
--- udd/tests/test_history_database.py	1970-01-01 00:00:00 +0000
+++ udd/tests/test_history_database.py	2012-04-04 17:18:33 +0000
@@ -0,0 +1,33 @@
+from datetime import datetime
+
+from bzrlib import tests
+
+from udd import icommon, idb
+
+
+class TestHistoryDb(tests.TestCase):
+
+    def setUp(self):
+        super(TestHistoryDb, self).setUp()
+        self.db = icommon.HistoryDatabase(*idb.get_memory_db_connection())
+
+
+class GetMainCountsTests(TestHistoryDb):
+
+    def test_returns_queued(self):
+        self.db.set_main_counts(2, 3)
+        counts = self.db.get_main_counts()
+        self.assertEqual(1, len(counts))
+        self.assertEqual(2, counts[0][1])
+
+    def test_returns_failed(self):
+        self.db.set_main_counts(2, 3)
+        counts = self.db.get_main_counts()
+        self.assertEqual(1, len(counts))
+        self.assertEqual(3, counts[0][2])
+
+    def test_returns_datetimes(self):
+        self.db.set_main_counts(1, 2)
+        counts = self.db.get_main_counts()
+        self.assertEqual(1, len(counts))
+        self.assertIsInstance(counts[0][0], datetime)

=== modified file 'udd/tests/test_status_database.py'
--- udd/tests/test_status_database.py	2012-03-23 16:56:38 +0000
+++ udd/tests/test_status_database.py	2012-04-04 17:18:33 +0000
@@ -99,6 +99,15 @@
         self.db.add_import_jobs(['foo'], now)
         self.assertEqual(now, self.db.last_import_time())
 
+    def test_last_import_time_sqlite(self):
+        # if the last import time was inserted by sqlite3 then it has a
+        # different format from the one that storm would insert. Check
+        # that the migration is handled ok.
+        now = datetime.datetime.utcnow()
+        self.db.conn.execute('INSERT into %s values (?)' % self.db.IMPORT_TABLE,
+                (now.strftime("%Y-%m-%d %H:%M:%S"),))
+        self.assertEqual(now.replace(microsecond=0), self.db.last_import_time())
+
 
 class TestRetry(TestStatusDb):