From 09f5310e78445eaea4e6b7aff45979f5cb89f957 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Fri, 16 Mar 2018 23:26:24 +0100 Subject: [PATCH] Precise tempest regex MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It stops running neutron tests which matched the former regex. Change-Id: Ica5a0d1f4858d01533156c98da87f9ed4662489f Signed-off-by: Cédric Ollivier --- functest/opnfv_tests/openstack/tempest/tempest.py | 2 +- functest/tests/unit/openstack/tempest/test_tempest.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index b3d091e57..c11262e02 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -110,7 +110,7 @@ class TempestCommon(testcase.TestCase): % conf_utils.TEMPEST_CUSTOM) else: if self.mode == 'smoke': - testr_mode = r"'tempest\.(api|scenario).*\[.*\bsmoke\b.*\]'" + testr_mode = r"'^tempest\.(api|scenario).*\[.*\bsmoke\b.*\]$'" elif self.mode == 'full': testr_mode = r"'^tempest\.'" else: diff --git a/functest/tests/unit/openstack/tempest/test_tempest.py b/functest/tests/unit/openstack/tempest/test_tempest.py index 436821143..3a4851314 100644 --- a/functest/tests/unit/openstack/tempest/test_tempest.py +++ b/functest/tests/unit/openstack/tempest/test_tempest.py @@ -76,7 +76,7 @@ class OSTempestTesting(unittest.TestCase): def _test_gen_tl_mode_default(self, mode, mock_exec=None): self.tempestcommon.mode = mode if self.tempestcommon.mode == 'smoke': - testr_mode = r"'tempest\.(api|scenario).*\[.*\bsmoke\b.*\]'" + testr_mode = r"'^tempest\.(api|scenario).*\[.*\bsmoke\b.*\]$'" elif self.tempestcommon.mode == 'full': testr_mode = r"'^tempest\.'" else: -- 2.16.6