From 4ff10fcd31cdfc41c62ff6d9b710c1951c83c3c5 Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Fri, 29 Apr 2022 10:54:08 -0700 Subject: [PATCH] fix SELinux facts tests * make the pre-flight sniffing more robust to different failure conditions (was failing on Ubuntu 22.04 VMs) * remove skip aliases (the test needs to function everywhere to assert that the selinux facts bits behave properly when it's N/A) --- .../targets/module_utils_facts.system.selinux/aliases | 4 ---- .../targets/module_utils_facts.system.selinux/tasks/main.yml | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/test/integration/targets/module_utils_facts.system.selinux/aliases b/test/integration/targets/module_utils_facts.system.selinux/aliases index ee281d27488..a6dafcf8cd8 100644 --- a/test/integration/targets/module_utils_facts.system.selinux/aliases +++ b/test/integration/targets/module_utils_facts.system.selinux/aliases @@ -1,5 +1 @@ shippable/posix/group1 -skip/osx -skip/macos -skip/freebsd -skip/docker diff --git a/test/integration/targets/module_utils_facts.system.selinux/tasks/main.yml b/test/integration/targets/module_utils_facts.system.selinux/tasks/main.yml index c599377b643..171723958e2 100644 --- a/test/integration/targets/module_utils_facts.system.selinux/tasks/main.yml +++ b/test/integration/targets/module_utils_facts.system.selinux/tasks/main.yml @@ -18,11 +18,12 @@ - name: check selinux policy type shell: grep '^SELINUXTYPE=' /etc/selinux/config | cut -d'=' -f2 + ignore_errors: yes register: r - set_fact: selinux_policytype: "{{ r.stdout_lines[0] }}" - when: r.changed + when: r is success and r.stdout_lines - assert: that: