Fix failing tests

Author: tersmitten

molecule/default/prepare.yml

@@ -2,4 +2,8 @@
 - name: Prepare
   hosts: all
   become: true
-  tasks: []
+  tasks:
+    - name: include vars
+      include_vars: "{{ playbook_dir }}/../../tests/vars/main.yml"
+    - name: include tasks
+      include: "{{ playbook_dir }}/../../tests/tasks/pre.yml"

molecule/default/verify.yml

@@ -2,4 +2,6 @@
 - name: Verify
   hosts: all
   become: true
-  tasks: []
+  tasks:
+    - name: include tasks
+      include: "{{ playbook_dir }}/../../tests/tasks/post.yml"

tests/post.yml renamed to tests/tasks/post.yml

@@ -1,18 +1,20 @@
 # post test file
 ---
-- name: post | install dependencies
+- name: install test dependencies
   apt:
     name:
       - curl
     state: "{{ apt_install_state | default('latest') }}"
     update_cache: true
     cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"
 
-- name: post | test installation
+- name: test tinyproxy installation
   command: >
     curl -sL --head https://www.google.com --proxy http://127.0.0.1:3128
   args:
     warn: false
   register: _result
   changed_when: false
   failed_when: _result.stdout.find('HTTP/1.0 200') == -1
+  tags:
+    - skip_ansible_lint

tests/tasks/pre.yml

@@ -0,0 +1,14 @@
+# post test file
+---
+- name: install test dependencies
+  apt:
+    name:
+      - net-tools
+      - iproute2
+      - ethtool
+    state: "{{ apt_install_state | default('latest') }}"
+    update_cache: true
+    cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"
+
+- name: (re)gather facts
+  action: setup

tests/test.yml

@@ -5,32 +5,9 @@
   become: true
   pre_tasks:
     - name: include vars
-      include_vars: main.yml
+      include_vars: "{{ playbook_dir }}/vars/main.yml"
   roles:
     - ../../
   post_tasks:
-    - include: post.yml
-  vars:
-    tinyproxy_tinyproxy_conf:
-      - |
-        User nobody
-        Group nogroup
-        Port {{ tinyproxy_port }}
-        Timeout 666
-        DefaultErrorFile "/usr/share/tinyproxy/default.html"
-        StatFile "/usr/share/tinyproxy/stats.html"
-        Logfile "/var/log/tinyproxy/tinyproxy.log"
-        LogLevel Info
-        PidFile "/var/run/tinyproxy/tinyproxy.pid"
-        MaxClients 100
-        MinSpareServers 5
-        MaxSpareServers 20
-        StartServers 10
-        MaxRequestsPerChild 0
-        {% for allow in tinyproxy_allow %}
-        Allow {{ allow }}
-        {% endfor %}
-        ViaProxyName "tinyproxy"
-        {% for connect_port in tinyproxy_connect_port %}
-        ConnectPort {{ connect_port }}
-        {% endfor %}
+    - name: include tasks
+      include: "{{ playbook_dir }}/tasks/post.yml"

tests/vagrant.yml

@@ -5,8 +5,9 @@
   become: true
   pre_tasks:
     - name: include vars
-      include_vars: main.yml
+      include_vars: "{{ playbook_dir }}/vars/main.yml"
   roles:
     - ../../
   post_tasks:
-    - include: post.yml
+    - name: include tasks
+      include: "{{ playbook_dir }}/tasks/post.yml"