From 4a54d6ce17f4a3d57a304b3973e8b34ed07f26d6 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 19 Feb 2018 08:23:14 +0100
Subject: Precise Tempest tests list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Else full mode could run tests defined in tempest plugins too [1].
[1] https://docs.openstack.org/tempest/latest/plugin-registry.html
Change-Id: I4355b03ba1b9ba47938f748c4f1a8822fd412142
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
functest/opnfv_tests/openstack/tempest/tempest.py | 6 +++---
functest/tests/unit/openstack/tempest/test_tempest.py | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 5148d114..105d1655 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -110,11 +110,11 @@ class TempestCommon(testcase.TestCase):
% conf_utils.TEMPEST_CUSTOM)
else:
if self.mode == 'smoke':
- testr_mode = "smoke"
+ testr_mode = r"'tempest\.(api|scenario).*\[.*\bsmoke\b.*\]'"
elif self.mode == 'full':
- testr_mode = ""
+ testr_mode = r"'^tempest\.'"
else:
- testr_mode = 'tempest.api.' + self.mode
+ testr_mode = self.mode
cmd = ("cd {0};"
"testr list-tests {1} > {2};"
"cd -;".format(verifier_repo_dir,
diff --git a/functest/tests/unit/openstack/tempest/test_tempest.py b/functest/tests/unit/openstack/tempest/test_tempest.py
index 060a8a01..c4c8a777 100644
--- a/functest/tests/unit/openstack/tempest/test_tempest.py
+++ b/functest/tests/unit/openstack/tempest/test_tempest.py
@@ -83,9 +83,9 @@ class OSTempestTesting(unittest.TestCase):
def _test_gen_tl_mode_default(self, mode):
self.tempestcommon.mode = mode
if self.tempestcommon.mode == 'smoke':
- testr_mode = "smoke"
+ testr_mode = r"'tempest\.(api|scenario).*\[.*\bsmoke\b.*\]'"
elif self.tempestcommon.mode == 'full':
- testr_mode = ""
+ testr_mode = r"'^tempest\.'"
else:
testr_mode = 'tempest.api.' + self.tempestcommon.mode
conf_utils.TEMPEST_RAW_LIST = 'raw_list'
--
cgit