Skip to content

Commit

Permalink
Fix lint
Browse files Browse the repository at this point in the history
  • Loading branch information
Liam Young committed Oct 25, 2023
1 parent baa02a3 commit 8f9eff8
Showing 1 changed file with 14 additions and 5 deletions.
19 changes: 14 additions & 5 deletions zaza/openstack/charm_tests/keystone/tests_ldap_k8s.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,13 @@
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."""

Expand Down Expand Up @@ -108,22 +112,27 @@ def _get_ldap_config(self):

@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


Expand Down

0 comments on commit 8f9eff8

Please sign in to comment.