summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--testcases/OpenStack/tempest/custom_tests/blacklist.txt23
-rwxr-xr-xtestcases/OpenStack/tempest/run_tempest.py28
2 files changed, 30 insertions, 21 deletions
diff --git a/testcases/OpenStack/tempest/custom_tests/blacklist.txt b/testcases/OpenStack/tempest/custom_tests/blacklist.txt
index 49605ca7b..65bee3334 100644
--- a/testcases/OpenStack/tempest/custom_tests/blacklist.txt
+++ b/testcases/OpenStack/tempest/custom_tests/blacklist.txt
@@ -15,3 +15,26 @@
- tempest.scenario.test_server_basic_ops.TestServerBasicOps.test_server_basic_ops[compute,id-7fff3fb3-91d8-4fd0-bd7d-0204f1f180ba,network,smoke]
- tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern[compute,id-557cd2c2-4eb8-4dce-98be-f86765ff311b,image,smoke,volume]
- tempest.scenario.test_volume_boot_pattern.TestVolumeBootPatternV2.test_volume_boot_pattern[compute,id-557cd2c2-4eb8-4dce-98be-f86765ff311b,image,smoke,volume]
+
+ scenarios:
+ - os-odl_l2-nofeature-ha
+ - os-odl_l2-nofeature-noha
+ - os-nosdn-nofeature-ha
+ - os-nosdn-nofeature-noha
+ - os-onos-nofeature-ha
+ - os-onos-nofeature-noha
+ - os-onos-sfc-ha
+ - os-onos-sfc-noha
+ - os-nosdn-lxd-ha
+ - os-nosdn-lxd-noha
+ installers:
+ - joid
+ tests:
+ - tempest.api.object_storage.test_account_quotas.AccountQuotasTest.test_admin_modify_quota
+ - tempest.api.object_storage.test_account_quotas.AccountQuotasTest.test_upload_valid_object
+ - tempest.api.object_storage.test_container_quotas.ContainerQuotasTest.test_upload_large_object
+ - tempest.api.object_storage.test_container_quotas.ContainerQuotasTest.test_upload_too_many_objects
+ - tempest.api.object_storage.test_container_quotas.ContainerQuotasTest.test_upload_valid_object
+ - tempest.api.object_storage.test_container_services.ContainerTest.test_create_container
+ - tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents
+ - tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_metadata
diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py
index 92a13f346..1dd908de4 100755
--- a/testcases/OpenStack/tempest/run_tempest.py
+++ b/testcases/OpenStack/tempest/run_tempest.py
@@ -382,34 +382,20 @@ def run_tempest(OPTION):
dur_sec_int = dur_sec_int + 60 * dur_min
stop_time = time.time()
- status = "FAIL"
try:
diff = (int(num_tests) - int(num_failures))
success_rate = 100 * diff / int(num_tests)
except:
success_rate = 0
- # For Tempest we assume that the success rate is above 90%
- if "smoke" in args.mode:
- case_name = "tempest_smoke_serial"
- # Note criteria hardcoded...TODO read it from testcases.yaml
- success_criteria = 100
- if success_rate >= success_criteria:
- status = "PASS"
- else:
- logger.info("Tempest success rate: %s%%. The success criteria to "
- "pass this test is %s%%. Marking the test as FAILED." %
- (success_rate, success_criteria))
+ if 'smoke' in args.mode:
+ case_name = 'tempest_smoke_serial'
else:
- case_name = "tempest_full_parallel"
- # Note criteria hardcoded...TODO read it from testcases.yaml
- success_criteria = 80
- if success_rate >= success_criteria:
- status = "PASS"
- else:
- logger.info("Tempest success rate: %s%%. The success criteria to "
- "pass this test is %s%%. Marking the test as FAILED." %
- (success_rate, success_criteria))
+ case_name = 'tempest_full_parallel'
+
+ status = ft_utils.check_success_rate(case_name, success_rate)
+ logger.info("Tempest %s success_rate is %s%%, is marked as %s"
+ % (case_name, success_rate, status))
# Push results in payload of testcase
if args.report: