wip

slapos/test/monitor/testrunpromise.py

@@ -174,9 +174,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_second_promise.py' % self.promise_dir,
     }
+    self.assertIsNotNone(second_result.pop(u'execution-time', None))
     self.assertEqual(expected_result, second_result)
 
   def test_promise_generic_failed(self):

slapos/test/promise/plugin/test_check_url_available.py

@@ -197,8 +197,9 @@ class CheckUrlAvailableMixin(TestPromisePluginMixin):
   def tearDownClass(cls):
     cls.server_process.terminate()
     cls.server_process.join()
-    # In Py3, the server socket does not seem to be automatically closed.
-    cls.server_process._target.__self__.socket.close()
+    if six.PY3:
+      # In Py3, the server socket does not seem to be automatically closed.
+      cls.server_process._target.__self__.socket.close()
     for p in [
       cls.test_server_certificate_file.name,
       cls.test_server_ca_certificate_file.name,