arif/zaza-openstack-tests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix lint

Browse Source
This commit is contained in:
Liam Young
2023-10-25 12:09:50 +00:00
parent baa02a30fc
commit 8f9eff813b
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
zaza/openstack/charm_tests/keystone/tests_ldap_k8s.py
View File

@@ -25,9 +25,13 @@ import zaza.charm_lifecycle.utils as lifecycle_utils
import zaza.model
import subprocess
class KeystoneLookupError(Exception):
"""An error looking up data in keystone."""
pass
class LdapExplicitCharmConfigTestsK8S(ks_tests.LdapExplicitCharmConfigTests):
"""Keystone LDAP tests for K8s deployment."""
@@ -108,22 +112,27 @@ class LdapExplicitCharmConfigTestsK8S(ks_tests.LdapExplicitCharmConfigTests):
@tenacity.retry(wait=tenacity.wait_exponential(multiplier=2, max=60),
reraise=True, stop=tenacity.stop_after_attempt(5),
retry=tenacity.retry_if_exception_type(KeystoneLookupError))
retry=tenacity.retry_if_exception_type(
KeystoneLookupError))
def _find_keystone_v3_group(self, group, domain):
logging.info('Looking for group: {}'.format(group))
try:
return super()._find_keystone_v3_group(group, domain)
except (AttributeError, http_NotFound, ConnectionError) as error:
except (AttributeError, http_NotFound, ConnectionError):
raise KeystoneLookupError
@tenacity.retry(wait=tenacity.wait_exponential(multiplier=2, max=60),
reraise=True, stop=tenacity.stop_after_attempt(5),
retry=tenacity.retry_if_exception_type(KeystoneLookupError))
retry=tenacity.retry_if_exception_type(
KeystoneLookupError))
def _find_keystone_v3_user(self, username, domain, group=None):
logging.info('Looking for user: {}'.format(username))
try:
return super()._find_keystone_v3_user(username, domain, group=group)
except (AttributeError, http_NotFound, ConnectionError) as error:
return super()._find_keystone_v3_user(
username,
domain,
group=group)
except (AttributeError, http_NotFound, ConnectionError):
raise KeystoneLookupError