From 12855e6c4433a24d64b4fefdd23999af343558e1 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Thu, 22 Jan 2015 11:15:16 -0500 Subject: [PATCH] Make some assumptions on 'check' unit tests after talking with jimi-c. Unit tests will now only all pass on ansible 1.8+. We'll probably need to revisit this, definitely for v2 if for no other reason --- awx/main/tests/tasks.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/awx/main/tests/tasks.py b/awx/main/tests/tasks.py index 3d4f392d21..5373a06284 100644 --- a/awx/main/tests/tasks.py +++ b/awx/main/tests/tasks.py @@ -602,6 +602,12 @@ class RunJobTest(BaseCeleryTest): qs = qs.exclude(event='runner_on_failed') else: qs = qs.exclude(event=('runner_on_%s' % runner_status)) + if runner_status == 'skipped': + # NOTE: Ansible >= 1.8.2 emits a runner_on_ok event in some cases + # of runner_on_skipped. We may need to revisit this if this assumption + # is not universal + qs = qs.exclude(event='runner_on_ok') + if async: if runner_status == 'failed': qs = qs.exclude(event='runner_on_ok')