summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Laska <jlaska@ansible.com>2014-03-07 10:41:01 -0500
committerMichael DeHaan <michael.dehaan@gmail.com>2014-03-13 08:29:17 -0400
commit48a1c156eec8f593ad25d5da68a49a9600574f89 (patch)
tree5bcd4d6cc5ee4b820d07938afc3c9dfdf6cf334f
parentf641cb166545c72c1dce0571f90b49b80c83b667 (diff)
downloadansible-48a1c156eec8f593ad25d5da68a49a9600574f89.tar.gz
[test_service] correct upstart service name and permissions
The 'service' utility was unable to find the 'ansible_test' service due to an unexpected filename. This patch corrects the filename and adjusts the permissions to match other service scripts within /etc/init/.
-rw-r--r--test/integration/roles/test_service/tasks/upstart_cleanup.yml4
-rw-r--r--test/integration/roles/test_service/tasks/upstart_setup.yml6
2 files changed, 5 insertions, 5 deletions
diff --git a/test/integration/roles/test_service/tasks/upstart_cleanup.yml b/test/integration/roles/test_service/tasks/upstart_cleanup.yml
index 3c4e4e5047..c99446bf65 100644
--- a/test/integration/roles/test_service/tasks/upstart_cleanup.yml
+++ b/test/integration/roles/test_service/tasks/upstart_cleanup.yml
@@ -1,10 +1,10 @@
- name: remove the upstart init file
- file: path=/etc/init/ansible_test state=absent
+ file: path=/etc/init/ansible_test.conf state=absent
register: remove_upstart_result
- name: assert that the upstart init file was removed
assert:
that:
- - "remove_upstart_result.path == '/etc/init/ansible_test'"
+ - "remove_upstart_result.path == '/etc/init/ansible_test.conf'"
- "remove_upstart_result.state == 'absent'"
diff --git a/test/integration/roles/test_service/tasks/upstart_setup.yml b/test/integration/roles/test_service/tasks/upstart_setup.yml
index 70fbee26d0..e889ef2789 100644
--- a/test/integration/roles/test_service/tasks/upstart_setup.yml
+++ b/test/integration/roles/test_service/tasks/upstart_setup.yml
@@ -1,12 +1,12 @@
- name: install the upstart init file
- copy: src=ansible.upstart dest=/etc/init/ansible_test mode=0755
+ copy: src=ansible.upstart dest=/etc/init/ansible_test.conf mode=0644
register: install_upstart_result
- name: assert that the upstart init file was installed
assert:
that:
- - "install_upstart_result.dest == '/etc/init/ansible_test'"
+ - "install_upstart_result.dest == '/etc/init/ansible_test.conf'"
- "install_upstart_result.state == 'file'"
- - "install_upstart_result.mode == '0755'"
+ - "install_upstart_result.mode == '0644'"
- "install_upstart_result.md5sum == 'ab3900ea4de8423add764c12aeb90c01'"