commit 05dc2d69299158228454a864a45fb25667e1be28
author Zuul <zuul@review.opendev.org> Mon Feb 10 19:26:57 2020 +0000
committer Gerrit Code Review <review@openstack.org> Mon Feb 10 19:26:57 2020 +0000
tree 4f46c9ff7e0bde40362f609efef7833bd47b4940
parent 8f925027fe6e49a7f9e2d2f940edd23f9fd975e6
parent 0643b17c119c6d614152eba8e488b84790191528

Merge "Rectify volumes tests"

heat_tempest_plugin/tests/api/gabbits/environments.yaml

diff --git a/heat_tempest_plugin/tests/api/gabbits/environments.yaml b/heat_tempest_plugin/tests/api/gabbits/environments.yaml
index 03849df..3d98a68 100644
--- a/heat_tempest_plugin/tests/api/gabbits/environments.yaml
+++ b/heat_tempest_plugin/tests/api/gabbits/environments.yaml
@@ -43,7 +43,7 @@
   redirects: True
   poll:
     count: 10
-    delay: 1.0
+    delay: 2.0
   response_json_paths:
     $.stack.stack_status: CREATE_COMPLETE
 

heat_tempest_plugin/tests/api/gabbits/resources.yaml

diff --git a/heat_tempest_plugin/tests/api/gabbits/resources.yaml b/heat_tempest_plugin/tests/api/gabbits/resources.yaml
index c99b6a9..f21fa67 100644
--- a/heat_tempest_plugin/tests/api/gabbits/resources.yaml
+++ b/heat_tempest_plugin/tests/api/gabbits/resources.yaml
@@ -38,7 +38,7 @@
   redirects: True
   poll:
     count: 10
-    delay: 1.0
+    delay: 2.0
   response_json_paths:
     $.stack.stack_status: CREATE_COMPLETE
 

heat_tempest_plugin/tests/api/gabbits/stacks.yaml

diff --git a/heat_tempest_plugin/tests/api/gabbits/stacks.yaml b/heat_tempest_plugin/tests/api/gabbits/stacks.yaml
index ba15f7e..e2ce6a6 100644
--- a/heat_tempest_plugin/tests/api/gabbits/stacks.yaml
+++ b/heat_tempest_plugin/tests/api/gabbits/stacks.yaml
@@ -38,7 +38,7 @@
   redirects: True
   poll:
     count: 10
-    delay: 1.0
+    delay: 2.0
   response_json_paths:
     $.stack.stack_status: CREATE_COMPLETE
 
@@ -88,7 +88,7 @@
   redirects: True
   poll:
     count: 10
-    delay: 1.0
+    delay: 2.0
   response_json_paths:
     $.stack.stack_status: CREATE_COMPLETE
 
@@ -132,7 +132,7 @@
   redirects: True
   poll:
     count: 10
-    delay: 1.0
+    delay: 2.0
   response_json_paths:
     $.stack.stack_status: UPDATE_COMPLETE
 
@@ -152,7 +152,7 @@
   redirects: True
   poll:
     count: 10
-    delay: 1.0
+    delay: 2.0
   response_json_paths:
     $.stack.stack_status: UPDATE_COMPLETE
 

heat_tempest_plugin/tests/api/test_heat_api.py

diff --git a/heat_tempest_plugin/tests/api/test_heat_api.py b/heat_tempest_plugin/tests/api/test_heat_api.py
index 7ba3a62..7ad35c8 100644
--- a/heat_tempest_plugin/tests/api/test_heat_api.py
+++ b/heat_tempest_plugin/tests/api/test_heat_api.py
@@ -92,8 +92,10 @@
             else:
                 register_test_case_id(test_case)
 
+    cert_validate = not conf.disable_ssl_certificate_validation,
     api_tests = driver.build_tests(test_dir, loader, url=endpoint, host="",
                                    fixture_module=fixtures,
+                                   cert_validate=cert_validate,
                                    test_loader_name=__name__)
     register_test_suite_ids(api_tests)
     return api_tests