Merge "Remove all references to /home/opnfv/repos/functest"

[functest.git] / functest / tests / unit / core / test_unit.py

diff --git a/functest/tests/unit/core/test_unit.py b/functest/tests/unit/core/test_unit.py
index c11d885..ca73de6 100644 (file)
--- a/functest/tests/unit/core/test_unit.py
+++ b/functest/tests/unit/core/test_unit.py
@@ -19,7 +19,8 @@ from functest.core import testcase
 class PyTestSuiteRunnerTesting(unittest.TestCase):
 
     def setUp(self):
-        self.psrunner = unit.PyTestSuiteRunner()
+        self.psrunner = unit.Suite()
+        self.psrunner.suite = "foo"
 
     @mock.patch('unittest.TestLoader')
     def _test_run(self, mock_class=None, result=mock.Mock(),
@@ -30,14 +31,19 @@ class PyTestSuiteRunnerTesting(unittest.TestCase):
             mock_class.assert_not_called()
 
     def test_check_suite_null(self):
-        self.assertEqual(self.psrunner.suite, None)
+        self.assertEqual(unit.Suite().suite, None)
+        self.psrunner.suite = None
+        self._test_run(result=mock.Mock(),
+                       status=testcase.TestCase.EX_RUN_ERROR)
 
     def test_run_no_ut(self):
         mock_result = mock.Mock(testsRun=0, errors=[], failures=[])
         self._test_run(result=mock_result,
                        status=testcase.TestCase.EX_RUN_ERROR)
         self.assertEqual(self.psrunner.result, 0)
-        self.assertEqual(self.psrunner.details, {'errors': [], 'failures': []})
+        self.assertEqual(self.psrunner.details,
+                         {'errors': 0, 'failures': 0, 'stream': '',
+                          'testsRun': 0})
         self.assertEqual(self.psrunner.is_successful(),
                          testcase.TestCase.EX_TESTCASE_FAILED)
 
@@ -48,8 +54,8 @@ class PyTestSuiteRunnerTesting(unittest.TestCase):
         self._test_run(result=mock_result)
         self.assertEqual(self.psrunner.result, 96)
         self.assertEqual(self.psrunner.details,
-                         {'errors': [('test1', 'error_msg1')],
-                          'failures': [('test2', 'failure_msg1')]})
+                         {'errors': 1, 'failures': 1, 'stream': '',
+                          'testsRun': 50})
         self.assertEqual(self.psrunner.is_successful(),
                          testcase.TestCase.EX_TESTCASE_FAILED)
 
@@ -58,7 +64,9 @@ class PyTestSuiteRunnerTesting(unittest.TestCase):
                                 failures=[])
         self._test_run(result=mock_result)
         self.assertEqual(self.psrunner.result, 100)
-        self.assertEqual(self.psrunner.details, {'errors': [], 'failures': []})
+        self.assertEqual(self.psrunner.details,
+                         {'errors': 0, 'failures': 0, 'stream': '',
+                          'testsRun': 50})
         self.assertEqual(self.psrunner.is_successful(),
                          testcase.TestCase.EX_OK)