Merge pull request #2 from Oefenweb/improved-tests

Oefenweb · May 17, 2018 · 21cd430 · 21cd430
2 parents 62145c9 + f07024c
commit 21cd430
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 2 deletions.
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -45,3 +45,29 @@
     - configuration
     - tinyproxy
     - tinyproxy-configuration
+
+- name: start and enable service
+  service:
+    name: tinyproxy
+    state: "{{ service_default_state | default('started') }}"
+    enabled: "{{ service_default_enabled | default(true) | bool }}"
+  when: ansible_service_mgr == 'systemd'
+  tags:
+    - configuration
+    - tinyproxy
+    - tinyproxy-start-enable-service
+    - tinyproxy-start-enable-service-systemd
+
+# TODO: Remove when support for Ubuntu 14.04 is dropped
+- name: start and enable service
+  service:
+    name: tinyproxy
+    state: "{{ service_default_state | default('started') }}"
+    enabled: "{{ service_default_enabled | default(true) | bool }}"
+    pattern: /usr/sbin/tinyproxy
+  when: ansible_service_mgr != 'systemd'
+  tags:
+    - configuration
+    - tinyproxy
+    - tinyproxy-start-enable-service
+    - tinyproxy-start-enable-service-initd
diff --git a/tests/post.yml b/tests/post.yml
@@ -0,0 +1,16 @@
+# post test file for tinyproxy
+---
+- name: post | install dependencies
+  apt:
+    name: "{{ item }}"
+    state: "{{ apt_install_state | default('latest') }}"
+    update_cache: true
+    cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"
+  with_items:
+    - curl
+
+- name: post | test installation
+  command: curl -s --head https://www.google.com --proxy http://127.0.0.1:3128
+  register: _result
+  changed_when: false
+  failed_when: _result.stdout.find('HTTP/1.0 200') == -1
diff --git a/tests/test.yml b/tests/test.yml
@@ -5,6 +5,8 @@
   become: true
   roles:
     - ../../
+  post_tasks:
+    - include: post.yml
   vars:
     tinyproxy_tinyproxy_conf:
       - |
@@ -31,5 +33,4 @@
         {% endfor %}
     tinyproxy_port: 3128
     tinyproxy_allow:
-      - "{{ ansible_lo['ipv4']['address'] }}"
-      - "{{ ansible_default_ipv4['address'] }}"
+      - 127.0.0.1
diff --git a/tests/vagrant.yml b/tests/vagrant.yml
@@ -5,6 +5,8 @@
   become: true
   roles:
     - ../../
+  post_tasks:
+    - include: post.yml
   vars:
     tinyproxy_port: 3128
     tinyproxy_allow: