From e45b3b89a20c98a7589ec4d5ceba7043808539e3 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Tue, 31 May 2016 13:43:06 -0700 Subject: Skip some service tests for systemd. --- test/integration/roles/test_service/tasks/main.yml | 10 ++++++++++ test/integration/roles/test_service/tasks/systemd_setup.yml | 3 +++ test/integration/roles/test_service/tasks/sysv_setup.yml | 3 +++ test/integration/roles/test_service/tasks/upstart_setup.yml | 3 +++ 4 files changed, 19 insertions(+) diff --git a/test/integration/roles/test_service/tasks/main.yml b/test/integration/roles/test_service/tasks/main.yml index dc53ed5295..5b7e6c0ceb 100644 --- a/test/integration/roles/test_service/tasks/main.yml +++ b/test/integration/roles/test_service/tasks/main.yml @@ -38,39 +38,47 @@ - name: find the service with a pattern service: name=ansible_test pattern="ansible_test_ser*" state=started register: start2_result + when: service_type != "systemd" - name: assert that the service was started via the pattern assert: that: - "start2_result.name == 'ansible_test'" - "start2_result.state == 'started'" + when: service_type != "systemd" - name: restart the ansible test service service: name=ansible_test state=restarted register: restart_result + when: service_type != "systemd" - name: assert that the service was restarted assert: that: - "restart_result.state == 'started'" + when: service_type != "systemd" - name: restart the ansible test service with a sleep service: name=ansible_test state=restarted sleep=2 register: restart_sleep_result + when: service_type != "systemd" - name: assert that the service was restarted with a sleep assert: that: - "restart_sleep_result.state == 'started'" + when: service_type != "systemd" - name: reload the ansible test service service: name=ansible_test state=reloaded register: reload_result + when: service_type != "systemd" - name: assert that the service was reloaded assert: that: - "reload_result.state == 'started'" + when: service_type != "systemd" - name: stop the ansible test service service: name=ansible_test state=stopped @@ -84,11 +92,13 @@ - name: disable the ansible test service service: name=ansible_test enabled=no register: disable_result + when: service_type != "systemd" - name: assert that the service was disabled assert: that: - "disable_result.enabled == false" + when: service_type != "systemd" - name: try to enable a broken service service: name=ansible_broken_test enabled=yes diff --git a/test/integration/roles/test_service/tasks/systemd_setup.yml b/test/integration/roles/test_service/tasks/systemd_setup.yml index d1428149d0..f03a774959 100644 --- a/test/integration/roles/test_service/tasks/systemd_setup.yml +++ b/test/integration/roles/test_service/tasks/systemd_setup.yml @@ -1,3 +1,6 @@ +- name: set service_type fact + set_fact: service_type=systemd + - name: install the systemd unit file copy: src=ansible.systemd dest=/etc/systemd/system/ansible_test.service register: install_systemd_result diff --git a/test/integration/roles/test_service/tasks/sysv_setup.yml b/test/integration/roles/test_service/tasks/sysv_setup.yml index 796a2fe9a7..53387dcb7a 100644 --- a/test/integration/roles/test_service/tasks/sysv_setup.yml +++ b/test/integration/roles/test_service/tasks/sysv_setup.yml @@ -1,3 +1,6 @@ +- name: set service_type fact + set_fact: service_type=sysv + - name: install the sysV init file copy: src=ansible.sysv dest=/etc/init.d/ansible_test mode=0755 register: install_sysv_result diff --git a/test/integration/roles/test_service/tasks/upstart_setup.yml b/test/integration/roles/test_service/tasks/upstart_setup.yml index e9607bb030..83fa765d18 100644 --- a/test/integration/roles/test_service/tasks/upstart_setup.yml +++ b/test/integration/roles/test_service/tasks/upstart_setup.yml @@ -1,3 +1,6 @@ +- name: set service_type fact + set_fact: service_type=upstart + - name: install the upstart init file copy: src=ansible.upstart dest=/etc/init/ansible_test.conf mode=0644 register: install_upstart_result -- cgit v1.2.1