Merge remote-tracking branch 'jcristau/cs-set-log-suite'

[dak.git] / tests / dbtest_timestamps.py

diff --git a/tests/dbtest_timestamps.py b/tests/dbtest_timestamps.py
index 98642c419624b3f25a923d0ed85c2c40a2db2775..8229e5dbdeb083ccce5ccc0121abf30a03c41d0e 100755 (executable)
--- a/tests/dbtest_timestamps.py
+++ b/tests/dbtest_timestamps.py
@@ -15,17 +15,12 @@ class TimestampTestCase(DBDakTestCase):
     TODO: Should we check all tables?
     """
 
-    def now(self):
-        local_session = DBConn().session()
-        query = local_session.query('now').from_statement('select now() as now')
-        local_session.close()
-        return query.first().now
-
     def sleep(self):
         time.sleep(0.001)
 
     def test_timestamps(self):
         timestamp01 = self.now()
+        self.session.rollback()
         self.sleep()
         uid = Uid(uid = 'ftp-master@debian.org')
         self.session.add(uid)
@@ -34,6 +29,7 @@ class TimestampTestCase(DBDakTestCase):
         modified01 = uid.modified
         self.sleep()
         timestamp02 = self.now()
+        self.session.rollback()
         self.assertTrue(timestamp01 < created01)
         self.assertTrue(timestamp01 < modified01)
         self.assertTrue(created01 < timestamp02)
@@ -46,6 +42,7 @@ class TimestampTestCase(DBDakTestCase):
         self.assertEqual(created01, created02)
         self.assertTrue(modified01 < modified02)
         self.sleep()
+        self.session.rollback()
         timestamp03 = self.now()
         self.assertTrue(modified02 < timestamp03)