Fix failing tests

Author: tersmitten

molecule/default/converge.yml

@@ -2,8 +2,6 @@
 - name: Converge
   hosts: all
   become: true
-  pre_tasks:
-    - name: include vars
-      include_vars: "{{ playbook_dir }}/../../tests/vars/main.yml"
+  tasks: []
   roles:
     - ../../../

molecule/default/prepare.yml

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

molecule/default/verify.yml

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

tests/tasks/post.yml

@@ -2,7 +2,7 @@
 ---
 - name: test presence of private key
   shell: >
-    diff {{ playbook_dir }}/../files/id_rsa ~dummy/.ssh/id_rsa
+    diff {{ ssh_keys_private_keys[0]['src'] }} ~dummy/.ssh/{{ ssh_keys_private_keys[0]['src'] | basename }}
     && (echo 'Private key test: pass' && exit 0)
     || (echo 'Private key test: fail' && exit 1)
   args:
@@ -13,7 +13,7 @@
 
 - name: test presence of public key
   shell: >
-    diff {{ playbook_dir }}/../files/id_rsa.pub ~dummy/.ssh/id_rsa.pub
+    diff {{ ssh_keys_public_keys[0]['src'] }} ~dummy/.ssh/{{ ssh_keys_public_keys[0]['src'] | basename }}
     && (echo 'Public key test: pass' && exit 0)
     || (echo 'Public key test: fail' && exit 1)
   args:

tests/tasks/pre.yml

@@ -10,9 +10,9 @@
 
 - name: generate key pair
   command: >
-    ssh-keygen -t rsa -b 2048 -C '' -P '' -f {{ playbook_dir }}/../files/id_rsa -q
+    ssh-keygen -t rsa -b 2048 -C '' -P '' -f {{ ssh_keys_private_keys[0]['src'] }} -q
   args:
-    creates: "{{ playbook_dir }}/../files/id_rsa"
+    creates: "{{ ssh_keys_private_keys[0]['src'] }}"
   become: false
 
 - name: create user (if needed)

tests/vars/main.yml

@@ -2,13 +2,13 @@
 ---
 ssh_keys_private_keys:
   - owner: dummy
-    src: id_rsa
+    src: "{{ playbook_dir }}/../files/id_rsa"
 ssh_keys_public_keys:
   - owner: dummy
-    src: id_rsa.pub
+    src: "{{ playbook_dir }}/../files/id_rsa.pub"
 ssh_keys_authorized_keys:
   - owner: dummy
-    src: id_rsa.pub
+    src: "{{ playbook_dir }}/../files/id_rsa.pub"
 ssh_keys_known_hosts:
   - hostname: github.com
     enctype: ssh-rsa