From 3a2c1541cac77bd08505cc6ccba4d988cc1c8213 Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Tue, 28 Nov 2017 12:26:45 -0600 Subject: [PATCH] Fix tests as filters syntax in recently modified integration tests (#33346) --- test/integration/targets/openssl_publickey/tasks/main.yml | 2 +- test/integration/targets/openssl_publickey/tests/validate.yml | 4 ++-- test/integration/targets/selinux/tasks/selinux.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/integration/targets/openssl_publickey/tasks/main.yml b/test/integration/targets/openssl_publickey/tasks/main.yml index 087bdc73b5a..7cb45c7ab83 100644 --- a/test/integration/targets/openssl_publickey/tasks/main.yml +++ b/test/integration/targets/openssl_publickey/tasks/main.yml @@ -23,7 +23,7 @@ path: '{{ output_dir }}/publickey-ssh.pub' privatekey_path: '{{ output_dir }}/privatekey.pem' format: OpenSSH - when: cryptography_version.stdout|version_compare('1.4.0', '>=') + when: cryptography_version.stdout is version('1.4.0', '>=') register: publickey_ssh_idempotence - name: Generate publickey2 - standard diff --git a/test/integration/targets/openssl_publickey/tests/validate.yml b/test/integration/targets/openssl_publickey/tests/validate.yml index c53b69ddc5b..e09d787d20e 100644 --- a/test/integration/targets/openssl_publickey/tests/validate.yml +++ b/test/integration/targets/openssl_publickey/tests/validate.yml @@ -31,8 +31,8 @@ - name: Validate public key - OpenSSH format - test idempotence (issue 33256) assert: that: - - not publickey_ssh_idempotence|changed - when: cryptography_version.stdout|version_compare('1.4.0', '>=') + - publickey_ssh_idempotence is not changed + when: cryptography_version.stdout is version('1.4.0', '>=') - name: Validate publickey2 (test - Ensure key has been removed) stat: diff --git a/test/integration/targets/selinux/tasks/selinux.yml b/test/integration/targets/selinux/tasks/selinux.yml index 443f9419291..59aec7a1ad3 100644 --- a/test/integration/targets/selinux/tasks/selinux.yml +++ b/test/integration/targets/selinux/tasks/selinux.yml @@ -200,8 +200,8 @@ - name: TEST 3 | Assert that status was not changed, the task failed, the msg contains proper information and SELinux was not changed assert: that: - - not _state_test1 | changed - - _state_test1 | failed + - _state_test1 is not changed + - _state_test1 is failed - _state_test1.msg == 'Policy non-existing-selinux-policy does not exist in /etc/selinux/' - ansible_selinux.config_mode == 'enforcing' - ansible_selinux.type == 'targeted'