CI: add more tests

molecule/default/playbook.yml

@@ -5,29 +5,8 @@
     - theo_url: https://theo.example.com
     - theo_client_token: zdOPNza4jjtceH5F2rU0iOkIJ2xlV4hGUauKT4cNe8HAp+AMnzYEzSc0EIBGM+MJuqL7gLd6bwIP
   pre_tasks:
-    - name: Update apt cache
-      apt:
-        update_cache: yes
-        cache_valid_time: 600
-      when: ansible_os_family == 'Debian'
-
-    - name: Ensure sshd is installed
-      package:
-        name:
-          - openssh-server
-        state: present
-
-    - name: Ensure sshd service is started
-      service:
-        name: ssh
-        state: started
-      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04'
-
-    - name: Ensure sshd service is started
-      service:
-        name: sshd
-        state: started
-      when: not (ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04')
+    - name: Import common tasks
+      import_tasks: ../resources/playbooks/pre-tasks.yml
 
   roles:
     - role: ansible-theo-agent

molecule/default/tests/test_default.py

@@ -37,6 +37,13 @@ def test_theo_config_file(host):
         assert line in conf
 
 
+def test_theo_cache_dir(host):
+    f = host.file('/var/cache/theo-agent')
+    assert f.exists
+    assert f.user == 'theo-agent'
+    assert f.group == 'root'
+
+
 def test_sshd_config(host):
     distro = os.getenv('MOLECULE_DISTRO', 'centos7')
     if distro == 'centos6':
@@ -63,7 +70,7 @@ def test_sshd_config(host):
         if line not in configlines:
             errors.append(line)
 
-    if(len(errors)):
+    if len(errors):
         print('Failed test_sshd_config, missing line(s)')
         for error in errors:
             print(error)

molecule/resources/playbooks/pre-tasks.yml

@@ -0,0 +1,24 @@
+---
+- name: Update apt cache
+  apt:
+    update_cache: yes
+    cache_valid_time: 600
+  when: ansible_os_family == 'Debian'
+
+- name: Ensure sshd is installed
+  package:
+    name:
+      - openssh-server
+    state: present
+
+- name: Ensure sshd service is started
+  service:
+    name: ssh
+    state: started
+  when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04'
+
+- name: Ensure sshd service is started
+  service:
+    name: sshd
+    state: started
+  when: not (ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04')

molecule/signature/playbook.yml

@@ -21,29 +21,9 @@
         JK85kX7Atut+tgWgwuwT5vcCAwEAAQ==
         -----END PUBLIC KEY-----
   pre_tasks:
-    - name: Update apt cache
-      apt:
-        update_cache: yes
-        cache_valid_time: 600
-      when: ansible_os_family == 'Debian'
+    - name: Import common tasks
+      import_tasks: ../resources/playbooks/pre-tasks.yml
 
-    - name: Ensure sshd is installed
-      package:
-        name:
-          - openssh-server
-        state: present
-
-    - name: Ensure sshd service is started
-      service:
-        name: ssh
-        state: started
-      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04'
-
-    - name: Ensure sshd service is started
-      service:
-        name: sshd
-        state: started
-      when: not (ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04')
 
   roles:
     - role: ansible-theo-agent