Rename pytest_suite_runner.py to unit.py

It also adds the rst files to include this module in apidoc.

Change-Id: Iabbb17bc8601265bd9436c75d1afc0b470df1eb4
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/docs/api/apidoc/functest.core.rst b/docs/api/apidoc/functest.core.rst
index 27b2ed1..55c795b 100644 (file)
--- a/docs/api/apidoc/functest.core.rst
+++ b/docs/api/apidoc/functest.core.rst
@@ -14,4 +14,5 @@ Submodules
    functest.core.feature
    functest.core.testcase
    functest.core.vnf
+   functest.core.unit
 

diff --git a/docs/api/apidoc/functest.core.unit.rst b/docs/api/apidoc/functest.core.unit.rst
new file mode 100644 (file)
index 0000000..5dd6880
--- /dev/null
+++ b/docs/api/apidoc/functest.core.unit.rst
@@ -0,0 +1,7 @@
+functest.core.unit module
+=========================
+
+.. automodule:: functest.core.unit
+    :members:
+    :undoc-members:
+    :show-inheritance:

diff --git a/functest/core/pytest_suite_runner.py b/functest/core/unit.py
similarity index 100%
rename from functest/core/pytest_suite_runner.py
rename to functest/core/unit.py

diff --git a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
index 94b9755..c180df6 100644 (file)
--- a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
+++ b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
@@ -7,7 +7,7 @@
 
 import logging
 
-from functest.core.pytest_suite_runner import PyTestSuiteRunner
+from functest.core import unit
 from functest.opnfv_tests.openstack.snaps import snaps_utils
 from functest.utils import functest_utils
 from functest.utils.constants import CONST
@@ -16,7 +16,7 @@ from snaps.openstack import create_flavor
 from snaps.openstack.tests import openstack_tests
 
 
-class SnapsTestRunner(PyTestSuiteRunner):
+class SnapsTestRunner(unit.PyTestSuiteRunner):
     """
     This test executes the SNAPS Python Tests
     """

diff --git a/functest/tests/unit/core/test_pytest_suite_runner.py b/functest/tests/unit/core/test_pytest_suite_runner.py
index f317cde..c11d885 100644 (file)
--- a/functest/tests/unit/core/test_pytest_suite_runner.py
+++ b/functest/tests/unit/core/test_pytest_suite_runner.py
@@ -12,20 +12,19 @@ import unittest
 
 import mock
 
-from functest.core import pytest_suite_runner
+from functest.core import unit
 from functest.core import testcase
 
 
 class PyTestSuiteRunnerTesting(unittest.TestCase):
 
     def setUp(self):
-        self.psrunner = pytest_suite_runner.PyTestSuiteRunner()
+        self.psrunner = unit.PyTestSuiteRunner()
 
     @mock.patch('unittest.TestLoader')
     def _test_run(self, mock_class=None, result=mock.Mock(),
                   status=testcase.TestCase.EX_OK):
-        with mock.patch('functest.core.pytest_suite_runner.'
-                        'unittest.TextTestRunner.run',
+        with mock.patch('functest.core.unit.unittest.TextTestRunner.run',
                         return_value=result):
             self.assertEqual(self.psrunner.run(), status)
             mock_class.assert_not_called()
@@ -78,8 +77,7 @@ class PyTestSuiteRunnerTesting(unittest.TestCase):
                                 failures=[])
         mock_obj = mock.Mock()
         mock_class.side_effect = mock_obj
-        with mock.patch('functest.core.pytest_suite_runner.'
-                        'unittest.TextTestRunner.run',
+        with mock.patch('functest.core.unit.unittest.TextTestRunner.run',
                         return_value=mock_result):
             self.assertEqual(self.psrunner.run(name='foo'),
                              testcase.TestCase.EX_OK)