diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-02-19 08:23:14 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-02-19 13:26:27 +0100 |
| commit | 4a54d6ce17f4a3d57a304b3973e8b34ed07f26d6 (patch) | |
| tree | a73c9ec252c88c841253afb802aaad33e56c342f | |
| parent | df3843843c4449585550e8a0bb8fcc79b43b7871 (diff) | |
Precise Tempest tests list
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>
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/tempest.py | 6 | ||||
| -rw-r--r-- | 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 5148d114e..105d16552 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 060a8a010..c4c8a7772 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' |