diff options
| author | Dmitry Tantsur <dtantsur@protonmail.com> | 2022-10-31 11:19:08 +0100 |
|---|---|---|
| committer | Dmitry Tantsur <dtantsur@protonmail.com> | 2022-10-31 11:19:08 +0100 |
| commit | cab51a9fcc022f2e4bb634277dd20e90e2dc78f7 (patch) | |
| tree | 62f933f2fcfb9a626ea6f706132b49f4771fd217 /ironic/common/glance_service/image_service.py | |
| parent | 5d5ae595380ac506eeb6a369e26efaed338790d1 (diff) | |
| download | ironic-cab51a9fcc022f2e4bb634277dd20e90e2dc78f7.tar.gz | |
Fix the invalid glance client test
It relied on mocking tenacity.retry, but it's executed on class
initialization. Depending on the ordering, it may do nothing or
it may replace ImageService.call with a mock.
Instead, add a new tenacity helper that loads an option in runtime.
As a nice side effect, [glance]num_retries is now mutable.
Change-Id: I2e02231d294997e824db77c998ef8d352fa69075
Diffstat (limited to 'ironic/common/glance_service/image_service.py')
| -rw-r--r-- | ironic/common/glance_service/image_service.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ironic/common/glance_service/image_service.py b/ironic/common/glance_service/image_service.py index 0a32eaf0a..1d9d6d4bc 100644 --- a/ironic/common/glance_service/image_service.py +++ b/ironic/common/glance_service/image_service.py @@ -33,6 +33,7 @@ from ironic.common.glance_service import service_utils from ironic.common.i18n import _ from ironic.common import keystone from ironic.common import swift +from ironic.common import utils from ironic.conf import CONF TempUrlCacheElement = collections.namedtuple('TempUrlCacheElement', @@ -114,7 +115,7 @@ class GlanceImageService(object): @tenacity.retry( retry=tenacity.retry_if_exception_type( exception.GlanceConnectionFailed), - stop=tenacity.stop_after_attempt(CONF.glance.num_retries + 1), + stop=utils.stop_after_retries('num_retries', group='glance'), wait=tenacity.wait_fixed(1), reraise=True ) |