shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 15:21:13 +03:00
Code Releases Activity

Merge pull request #5611 from kdelee/awxkit-better-timeout-error

Browse Source 
[awxkit] Raise a more informative error when timeout

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot] 2020-01-08 18:47:16 +00:00 committed by GitHub
commit 1c09114abd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
awxkit/awxkit/api/mixins/has_status.py
View File

@ -4,6 +4,7 @@ import json
import six import six
from awxkit.utils import poll_until from awxkit.utils import poll_until
from awxkit.exceptions import WaitUntilTimeout
def bytes_to_str(obj): def bytes_to_str(obj):
@ -28,7 +29,11 @@ class HasStatus(object):
def wait_until_status(self, status, interval=1, timeout=60, **kwargs): def wait_until_status(self, status, interval=1, timeout=60, **kwargs):
status = [status] if not isinstance(status, (list, tuple)) else status status = [status] if not isinstance(status, (list, tuple)) else status
try:
poll_until(lambda: getattr(self.get(), 'status') in status, interval=interval, timeout=timeout, **kwargs) poll_until(lambda: getattr(self.get(), 'status') in status, interval=interval, timeout=timeout, **kwargs)
except WaitUntilTimeout:
# This will raise a more informative error than just "WaitUntilTimeout" error
self.assert_status(status)
return self return self
def wait_until_completed(self, interval=5, timeout=60, **kwargs): def wait_until_completed(self, interval=5, timeout=60, **kwargs):