summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2019-10-24 21:49:04 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-10-24 21:49:04 +0000
commit4c89f6604e8112943107e7108942bc31129a20a6 (patch)
tree8643d17f9549b438f01ff596dd5ca1eee3864dfd
parent9679178a1f99b38264a2afb56097700bef34868a (diff)
parent7c67624b8ee7f7a9a7fb36bb25e9881a63c982d4 (diff)
Merge "Allow checking Tests count"
-rw-r--r--docker/smoke/testcases.yaml3
-rw-r--r--functest/ci/testcases.yaml3
-rw-r--r--functest/opnfv_tests/openstack/tempest/tempest.py4
3 files changed, 10 insertions, 0 deletions
diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index 00930a5..e600abd 100644
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -44,6 +44,7 @@ tiers:
criteria: 100
blocking: false
deny_skipping: true
+ tests_count: 219
description: >-
This test case runs a sub group of tests of the OpenStack
Compute testcases.
@@ -60,6 +61,7 @@ tiers:
criteria: 100
blocking: false
deny_skipping: true
+ tests_count: 57
description: >-
This test case runs a sub group of tests of the OpenStack
Object testcases.
@@ -76,6 +78,7 @@ tiers:
criteria: 100
blocking: false
deny_skipping: true
+ tests_count: 275
description: >-
This test case runs a sub group of tests of the OpenStack
Platform testcases.
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 8b2a6c3..f7d8e9b 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -207,6 +207,7 @@ tiers:
criteria: 100
blocking: false
deny_skipping: true
+ tests_count: 219
description: >-
This test case runs a sub group of tests of the OpenStack
Compute testcases.
@@ -223,6 +224,7 @@ tiers:
criteria: 100
blocking: false
deny_skipping: true
+ tests_count: 57
description: >-
This test case runs a sub group of tests of the OpenStack
Object testcases.
@@ -239,6 +241,7 @@ tiers:
criteria: 100
blocking: false
deny_skipping: true
+ tests_count: 275
description: >-
This test case runs a sub group of tests of the OpenStack
Platform testcases.
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 05758ab..d30d594 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -98,6 +98,7 @@ class TempestCommon(singlevm.VmReady2):
except Exception: # pylint: disable=broad-except
pass
self.deny_skipping = kwargs.get("deny_skipping", False)
+ self.tests_count = kwargs.get("tests_count", 0)
def check_services(self):
"""Check the mandatory services."""
@@ -642,6 +643,9 @@ class TempestCommon(singlevm.VmReady2):
skips = self.details.get("skipped_number", 0)
if skips > 0 and self.deny_skipping:
return testcase.TestCase.EX_TESTCASE_FAILED
+ if self.tests_count and (
+ self.details.get("tests_number", 0) != self.tests_count):
+ return testcase.TestCase.EX_TESTCASE_FAILED
return super(TempestCommon, self).is_successful()