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 1a53ae8665da5c9241370165bc5136c5926533a8..8229e5dbdeb083ccce5ccc0121abf30a03c41d0e 100755 (executable)
--- a/tests/dbtest_timestamps.py
+++ b/tests/dbtest_timestamps.py
@@ -4,7 +4,6 @@ from db_test import DBDakTestCase
 
 from daklib.dbconn import DBConn, Uid
 
-from sqlalchemy import func
 import time
 import unittest
 
@@ -16,20 +15,12 @@ class TimestampTestCase(DBDakTestCase):
     TODO: Should we check all tables?
     """
 
-    def now(self):
-        "returns the current time at the db server"
-
-        # we fetch a fresh session each time to avoid caching
-        local_session = DBConn().session()
-        current_time = local_session.query(func.now()).scalar()
-        local_session.close()
-        return current_time
-
     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)
@@ -38,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)
@@ -50,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)