Merge pull request #428 from kbase/dev-fix_tests_on_non_UTC_systems

Fix tests on non-UTC systems

lib/execution_engine2/db/MongoUtil.py

@@ -3,7 +3,6 @@
 import time
 import traceback
 from contextlib import contextmanager
-from datetime import datetime
 from typing import Dict, List
 from bson.objectid import ObjectId
 from mongoengine import connect, connection
@@ -285,7 +284,7 @@ def update_jobs_to_queued(
 
         bulk_update_scheduler_jobs = []
         bulk_update_created_to_queued = []
-        queue_time_now = datetime.utcnow().timestamp()
+        queue_time_now = time.time()
         for job_id_pair in job_id_pairs:
             if job_id_pair.job_id is None:
                 raise ValueError(

test/tests_for_db/ee2_MongoUtil_test.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 import logging
 import os
+import time
 import unittest
-from datetime import datetime
 
 from bson.objectid import ObjectId
 
@@ -87,8 +87,7 @@ def test_update_jobs_enmasse(self):
             scheduler_ids = ["humpty", "dumpty", "alice"]
             jobs_to_update = list(map(JobIdPair, job_ids, scheduler_ids))
 
-            now_ms = datetime.utcnow().timestamp()
-
+            now_ms = time.time()
             self.getMongoUtil().update_jobs_to_queued(jobs_to_update)
             job.reload()
             job2.reload()