From 2c3d2db4ec014d69b927434fc863cfe13a5d6d91 Mon Sep 17 00:00:00 2001 From: David Wilson Date: Tue, 17 Apr 2018 14:02:21 +0000 Subject: [PATCH] tests: fix output checks for Linux --- .../runner/custom_binary_single_null.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/ansible/integration/runner/custom_binary_single_null.yml b/tests/ansible/integration/runner/custom_binary_single_null.yml index 4933a8ec..6cce33d2 100644 --- a/tests/ansible/integration/runner/custom_binary_single_null.yml +++ b/tests/ansible/integration/runner/custom_binary_single_null.yml @@ -11,12 +11,14 @@ any_errors_fatal: true tasks: - assert: - that: | - out.failed and - out.results[0].failed and - out.results[0].msg == 'MODULE FAILURE' and - out.results[0].module_stdout.startswith('/bin/sh: ') and - out.results[0].module_stdout.endswith('/custom_binary_single_null: cannot execute binary file\r\n') + that: + - "out.failed" + - "out.results[0].failed" + - "out.results[0].msg == 'MODULE FAILURE'" + - "out.results[0].module_stdout.startswith('/bin/sh: ')" + - | + out.results[0].module_stdout.endswith('/custom_binary_single_null: cannot execute binary file\r\n') or + out.results[0].module_stdout.endswith('/custom_binary_single_null: Exec format error\r\n') # Can't test this: Mitogen returns 126, 2.5.x returns 126, 2.4.x discarded the