mirror of
https://github.com/ansible/awx.git
synced 2026-05-13 20:37:39 -02:30
include awxkit CI in zuul runs
additionally, fix up some flake8 failures
This commit is contained in:
@@ -375,14 +375,14 @@ class HasCreate(object):
|
||||
to_teardown = all_instantiated_dependencies(self)
|
||||
to_teardown_types = set(map(get_class_if_instance, to_teardown))
|
||||
order = [
|
||||
set(
|
||||
[
|
||||
potential for potential in (
|
||||
get_class_if_instance(x) for x in group) if potential in to_teardown_types
|
||||
]
|
||||
)
|
||||
for group in page_creation_order(self, *to_teardown)
|
||||
set(
|
||||
[
|
||||
potential for potential in (
|
||||
get_class_if_instance(x) for x in group) if potential in to_teardown_types
|
||||
]
|
||||
)
|
||||
for group in page_creation_order(self, *to_teardown)
|
||||
]
|
||||
order.reverse()
|
||||
for teardown_group in order:
|
||||
for teardown_class in teardown_group:
|
||||
|
||||
@@ -33,8 +33,8 @@ class UnifiedJob(HasStatus, base.Base):
|
||||
def result_stdout(self):
|
||||
if 'result_stdout' not in self.json and 'stdout' in self.related:
|
||||
return self.connection.get(
|
||||
self.related.stdout, query_parameters=dict(format='txt_download')
|
||||
).content.decode()
|
||||
self.related.stdout, query_parameters=dict(format='txt_download')
|
||||
).content.decode()
|
||||
if str(self.json.get('result_stdout')) == 'stdout capture is missing' and 'stdout' in self.related:
|
||||
ping = self.walk(resources.ping)
|
||||
if self.execution_node != ping.active_node:
|
||||
@@ -60,7 +60,7 @@ class UnifiedJob(HasStatus, base.Base):
|
||||
pretty_stdout = pformat(stdout)
|
||||
raise AssertionError(
|
||||
'Expected "{}", but it was not found in stdout. Full stdout:\n {}'.format(expected_text, pretty_stdout)
|
||||
)
|
||||
)
|
||||
|
||||
@property
|
||||
def is_successful(self):
|
||||
|
||||
@@ -29,8 +29,9 @@ class User(HasCreate, base.Base):
|
||||
random_title()),
|
||||
email=kwargs.get(
|
||||
'email',
|
||||
'{}@example.com'.format(random_title(5, non_ascii=False)))
|
||||
)
|
||||
'{}@example.com'.format(random_title(5, non_ascii=False))
|
||||
)
|
||||
)
|
||||
return payload
|
||||
|
||||
def create_payload(self, username='', password='', **kwargs):
|
||||
|
||||
Reference in New Issue
Block a user