summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvalentin boucher <valentin.boucher@orange.com>2017-05-24 09:21:12 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-05-24 09:21:12 +0000
commit7c99fedf61ceba4a045b85dc8f4c889e86900f7f (patch)
treefbaffa5062d90d0a2a7d7efb04e1a98e47992f65
parent39737dbdcebee2535780d799174b8195ef8cf6d8 (diff)
parentb5ced1899ff13796eb0836ca75fddd1c787d8650 (diff)
Merge "Rename the class TestSuiteRunner to Suite"
-rw-r--r--functest/core/unit.py4
-rw-r--r--functest/opnfv_tests/openstack/snaps/snaps_test_runner.py2
-rw-r--r--functest/tests/unit/core/test_unit.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/functest/core/unit.py b/functest/core/unit.py
index efcef7b66..6d8b5879e 100644
--- a/functest/core/unit.py
+++ b/functest/core/unit.py
@@ -18,14 +18,14 @@ import six
from functest.core import testcase
-class PyTestSuiteRunner(testcase.TestCase):
+class Suite(testcase.TestCase):
"""
This superclass is designed to execute pre-configured unittest.TestSuite()
objects
"""
def __init__(self, **kwargs):
- super(PyTestSuiteRunner, self).__init__(**kwargs)
+ super(Suite, self).__init__(**kwargs)
self.suite = None
self.logger = logging.getLogger(__name__)
diff --git a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
index c180df619..2b98a202f 100644
--- a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
+++ b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
@@ -16,7 +16,7 @@ from snaps.openstack import create_flavor
from snaps.openstack.tests import openstack_tests
-class SnapsTestRunner(unit.PyTestSuiteRunner):
+class SnapsTestRunner(unit.Suite):
"""
This test executes the SNAPS Python Tests
"""
diff --git a/functest/tests/unit/core/test_unit.py b/functest/tests/unit/core/test_unit.py
index c11d8853e..f86ea8d31 100644
--- a/functest/tests/unit/core/test_unit.py
+++ b/functest/tests/unit/core/test_unit.py
@@ -19,7 +19,7 @@ from functest.core import testcase
class PyTestSuiteRunnerTesting(unittest.TestCase):
def setUp(self):
- self.psrunner = unit.PyTestSuiteRunner()
+ self.psrunner = unit.Suite()
@mock.patch('unittest.TestLoader')
def _test_run(self, mock_class=None, result=mock.Mock(),