commit 7bfa7a491e8569d65c783c91c6619129895f975f
author harhipova <harhipova@mirantis.com> Mon Sep 07 14:26:37 2020 +0000
committer Gerrit Code Review <mail@domain.com> Mon Sep 07 14:26:37 2020 +0000
tree 05952fffd4b63fafd6555cbd1f75411dd5a8f760
parent 168fc023259eb5676fe3054699e4089048b2fa9b
parent 134b73982a0c03754f41fe09a9f84f7a00c1c672

Merge "Add rbd_monitoring_enabled for Ceph Nautilus"

tcp_tests/helpers/utils.py

diff --git a/tcp_tests/helpers/utils.py b/tcp_tests/helpers/utils.py
index f0424e6..46fc90d 100644
--- a/tcp_tests/helpers/utils.py
+++ b/tcp_tests/helpers/utils.py
@@ -178,7 +178,8 @@
 
 def retry(tries_number=2, exception=Exception, interval=0):
     def _retry(func):
-        assert tries_number >= 1, 'ERROR! @retry is called with no tries!'
+        if tries_number < 1:
+            LOG.warning('ERROR! @retry is called with no tries!')
 
         def wrapper(*args, **kwargs):
             iter_number = 1

tcp_tests/managers/envmanager_heat.py

diff --git a/tcp_tests/managers/envmanager_heat.py b/tcp_tests/managers/envmanager_heat.py
index 2460988..30c4850 100644
--- a/tcp_tests/managers/envmanager_heat.py
+++ b/tcp_tests/managers/envmanager_heat.py
@@ -557,7 +557,7 @@
         def safe_heat_stack_create():
             self.__stacks.create(**fields)
 
-        @retry(exceptions.EnvironmentBadStatus, delay=60, tries=3)
+        @retry(exceptions.EnvironmentBadStatus, delay=60, tries=1)
         def safe_create():
             self.delete_environment()
             safe_heat_stack_create()