Merge remote branch 'odyx/win32-loader-autobyhand' into merge

[dak.git] / tests / dbtest_timestamps.py

diff --git a/tests/dbtest_timestamps.py b/tests/dbtest_timestamps.py
index ff19d7d0ad18dd7d47be6d8887e25a5aa2c40d9e..1a53ae8665da5c9241370165bc5136c5926533a8 100755 (executable)
--- a/tests/dbtest_timestamps.py
+++ b/tests/dbtest_timestamps.py
@@ -4,6 +4,7 @@ from db_test import DBDakTestCase
 
 from daklib.dbconn import DBConn, Uid
 
+from sqlalchemy import func
 import time
 import unittest
 
@@ -16,10 +17,13 @@ class TimestampTestCase(DBDakTestCase):
     """
 
     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()
-        query = local_session.query('now').from_statement('select now() as now')
+        current_time = local_session.query(func.now()).scalar()
         local_session.close()
-        return query.one().now
+        return current_time
 
     def sleep(self):
         time.sleep(0.001)