From 0719be852f93d81849d81c8dbf8379b344ec63cf Mon Sep 17 00:00:00 2001 From: Richard C Isaacson Date: Thu, 20 Feb 2014 16:55:50 -0500 Subject: [PATCH] Update in response to ubuntu issues. --- tests_new/integration/roles/test_file/tasks/main.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests_new/integration/roles/test_file/tasks/main.yml b/tests_new/integration/roles/test_file/tasks/main.yml index 4fc86e995b..174f66a9fb 100644 --- a/tests_new/integration/roles/test_file/tasks/main.yml +++ b/tests_new/integration/roles/test_file/tasks/main.yml @@ -98,13 +98,14 @@ register: selinux_installed - name: determine if selinux is enabled - shell: getenforce | grep Disabled + shell: getenforce register: selinux_enabled when: selinux_installed.stdout != "" ignore_errors: true -- include: selinux_tests.yml - when: selinux_enabled.stdout != "Disabled" +- name: decide to include or not include selinux tests + include: selinux_tests.yml + when: selinux_installed.stdout != "" and selinux_enabled.stdout != "Disabled" - name: remote directory foobar file: path={{output_dir}}/foobar state=absent