Manage criteria in TestCase

[functest.git] / functest / core / pytest_suite_runner.py

diff --git a/functest/core/pytest_suite_runner.py b/functest/core/pytest_suite_runner.py
index ba372c3..8b5da05 100644 (file)
--- a/functest/core/pytest_suite_runner.py
+++ b/functest/core/pytest_suite_runner.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-#
 # Copyright (c) 2015 All rights reserved
 # This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
@@ -7,27 +5,27 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 
-from functest.core import TestCasesBase
+import testcase as base
 import unittest
 import time
 
 
-class PyTestSuiteRunner(TestCasesBase.TestCasesBase):
+class PyTestSuiteRunner(base.TestCase):
     """
     This superclass is designed to execute pre-configured unittest.TestSuite()
     objects
     """
-    def __init__(self):
-        super(PyTestSuiteRunner, self).__init__()
+    def __init__(self, **kwargs):
+        super(PyTestSuiteRunner, self).__init__(**kwargs)
         self.suite = None
 
     def run(self, **kwargs):
         """
         Starts test execution from the functest framework
         """
-        start_time = time.time()
+        self.start_time = time.time()
         result = unittest.TextTestRunner(verbosity=2).run(self.suite)
-        end_time = time.time()
+        self.stop_time = time.time()
 
         if result.errors:
             self.logger.error('Number of errors in test suite - ' +
@@ -41,16 +39,19 @@ class PyTestSuiteRunner(TestCasesBase.TestCasesBase):
             for test, message in result.failures:
                 self.logger.error(str(test) + " FAILED with " + message)
 
-        if (result.errors and len(result.errors) > 0) \
-                or (result.failures and len(result.failures) > 0):
+        # a result can be PASS or FAIL
+        # But in this case it means that the Execution was OK
+        # we shall distinguish Execution Error from FAIL results
+        # TestCase.EX_RUN_ERROR means that the test case was not run
+        # not that it was run but the result was FAIL
+        exit_code = base.TestCase.EX_OK
+        if ((result.errors and len(result.errors) > 0)
+                or (result.failures and len(result.failures) > 0)):
             self.logger.info("%s FAILED" % self.case_name)
-            self.criteria = 'FAIL'
-            exit_code = TestCasesBase.TestCasesBase.EX_RUN_ERROR
+            self.result = 'FAIL'
         else:
             self.logger.info("%s OK" % self.case_name)
-            exit_code = TestCasesBase.TestCasesBase.EX_OK
+            self.result = 'PASS'
 
-        self.details = {'timestart': start_time,
-                        'duration': round(end_time - start_time, 1),
-                        'status': self.criteria}
+        self.details = {}
         return exit_code