wip

slapos/test/monitor/testrunpromise.py

@@ -158,9 +158,9 @@ class RunPromise(GenericPromise):
       u'result': {
         u'failed': False, u'message': u'success', u'type': u'Test Result'
         },
-      u'execution-time': 0.05,
       u'path': u'%s/my_promise.py' % self.promise_dir,
     }
+    self.assertIsNotNone(my_result.pop(u'execution-time', None))
     self.assertEqual(expected_result, my_result)
 
     result_file = os.path.join(self.output_dir, 'my_second_promise.status.json')
@@ -196,9 +196,9 @@ class RunPromise(GenericPromise):
       u'result': {
         u'failed': True, u'message': u'failed', u'type': u'Test Result'
         },
-      u'execution-time': 0.05,
       u'path': u'%s/my_promise.py' % self.promise_dir,
     }
+    self.assertIsNotNone(my_result.pop(u'execution-time', None))
     self.assertEqual(expected_result, my_result)
 
   def test_promise_generic_status_change(self):
@@ -218,9 +218,9 @@ class RunPromise(GenericPromise):
       u'result': {
         u'failed': True, u'message': u'failed', u'type': u'Test Result'
         },
-      u'execution-time': 0.05,
       u'path': u'%s/my_promise.py' % self.promise_dir,
     }
+    self.assertIsNotNone(my_result.pop(u'execution-time', None))
     self.assertEqual(expected_result, my_result)
 
     os.system('rm %s/*.pyc' % self.promise_dir)
@@ -238,9 +238,9 @@ class RunPromise(GenericPromise):
       u'result': {
         u'failed': False, u'message': u'success', u'type': u'Test Result'
         },
-      u'execution-time': 0.05,
       u'path': u'%s/my_promise.py' % self.promise_dir,
     }
+    self.assertIsNotNone(my_result.pop(u'execution-time', None))
     self.assertEqual(expected_result, my_result)
 
   def test_promise_generic_periodicity(self):
@@ -300,7 +300,6 @@ class RunPromise(GenericPromise):
       u'result': {
         u'failed': False, u'message': u'success', u'type': u'Test Result'
         },
-      u'execution-time': 0.05,
       u'path': u'%s' % promise,
     }
 
@@ -311,6 +310,7 @@ class RunPromise(GenericPromise):
     with open(result_file) as f:
       result2 = json.load(f)
     start_date2 = datetime.strptime(result2['result'].pop('date'), '%Y-%m-%dT%H:%M:%S+0000')
+    self.assertIsNotNone(result2.pop(u'execution-time', None))
     self.assertEqual(expected_result, result2)
 
   def test_promise_two_folder(self):
@@ -334,9 +334,9 @@ class RunPromise(GenericPromise):
       u'result': {
         u'failed': False, u'message': u'success', u'type': u'Test Result'
         },
-      u'execution-time': 0.05,
       u'path': u'%s' % promise,
     }
+    self.assertIsNotNone(result1.pop(u'execution-time', None))
     self.assertEqual(expected_result, result1)
 
     result2 = json.load(open(result2_file))
@@ -347,9 +347,9 @@ class RunPromise(GenericPromise):
       u'result': {
         u'failed': False, u'message': u'success', u'type': u'Test Result'
         },
-      u'execution-time': 0.05,
       u'path': u'%s' % promise2,
     }
+    self.assertIsNotNone(result2.pop(u'execution-time', None))
     self.assertEqual(expected_result, result2)
 
   def test_promise_NOK(self):
@@ -368,9 +368,9 @@ class RunPromise(GenericPromise):
       u'result': {
         u'failed': True, u'message': u'failed', u'type': u'Test Result'
         },
-      u'execution-time': 0.05,
       u'path': u'%s' % promise,
     }
+    self.assertIsNotNone(result1.pop(u'execution-time', None))
     self.assertEqual(expected_result, result1)
 
     # second run
@@ -379,6 +379,7 @@ class RunPromise(GenericPromise):
     with open(result_file) as f:
       result2 = json.load(f)
     result2['result'].pop('date')
+    self.assertIsNotNone(result2.pop(u'execution-time', None))
     self.assertEqual(expected_result, result2)
 
   def test_promise_mixed(self):
@@ -397,9 +398,9 @@ class RunPromise(GenericPromise):
       u'result': {
         u'failed': False, u'message': u'success', u'type': u'Test Result'
         },
-      u'execution-time': 0.05,
       u'path': u'%s' % promise,
     }
+    self.assertIsNotNone(result1.pop(u'execution-time', None))
     self.assertEqual(expected_result, result1)
 
     # second run with failure
@@ -414,5 +415,6 @@ class RunPromise(GenericPromise):
     with open(result_file) as f:
       result2 = json.load(f)
     result2['result'].pop('date')
+    self.assertIsNotNone(result2.pop(u'execution-time', None))
     self.assertEqual(expected_result, result2)