From 5b40b8d1550e53b13b91a33e5a10993bcb43347a Mon Sep 17 00:00:00 2001 From: Steven Robertson Date: Sat, 3 Oct 2020 18:12:02 -0700 Subject: [PATCH] fix runner_one_job ansible version comparison --- tests/ansible/integration/async/runner_one_job.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/ansible/integration/async/runner_one_job.yml b/tests/ansible/integration/async/runner_one_job.yml index 871d672f..bea6ed9c 100644 --- a/tests/ansible/integration/async/runner_one_job.yml +++ b/tests/ansible/integration/async/runner_one_job.yml @@ -40,15 +40,14 @@ - result1.changed == True # ansible/b72e989e1837ccad8dcdc926c43ccbc4d8cdfe44 - | - (ansible_version.full >= '2.8' and + (ansible_version.full is version('2.8', ">=") and result1.cmd == "echo alldone;\nsleep 1;\n") or - (ansible_version.full < '2.8' and + (ansible_version.full is version('2.8', '<') and result1.cmd == "echo alldone;\n sleep 1;") - result1.delta|length == 14 - result1.start|length == 26 - result1.finished == 1 - result1.rc == 0 - - result1.start|length == 26 - assert: that: @@ -56,10 +55,9 @@ - result1.stderr_lines == [] - result1.stdout == "alldone" - result1.stdout_lines == ["alldone"] - when: ansible_version.full > '2.8' # ansible#51393 + when: ansible_version.full is version('2.8', '>') # ansible#51393 - assert: that: - result1.failed == False - when: ansible_version.full > '2.4' - + when: ansible_version.full is version('2.4', '>')