Switch tests to use Molecule.

.gitignore

@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc

.travis.yml

@@ -1,53 +1,49 @@
 ---
+language: python
 services: docker
 
 env:
   global:
-    php_version: "7.1"
-
+    - ROLE_NAME: php-versions
   matrix:
-    # Default - PHP 7.1
-    - distro: centos7
-    - distro: debian9
-    - distro: ubuntu1804
-    - distro: ubuntu1604
+    # Default PHP version.
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
+    - MOLECULE_DISTRO: ubuntu1804
+    - MOLECULE_DISTRO: ubuntu1604
+    - MOLECULE_DISTRO: debian9
 
-    # PHP 7.2
-    - distro: centos7
-      playbook: test-7.2.yml
-      php_version: "7.2"
-    - distro: ubuntu1804
-      playbook: test-7.2.yml
-      php_version: "7.2"
-    - distro: ubuntu1604
-      playbook: test-7.2.yml
-      php_version: "7.2"
-    - distro: debian9
-      playbook: test-7.2.yml
-      php_version: "7.2"
+    # PHP 7.2.
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
+      MOLECULE_PLAYBOOK: playbook-7.2.yml
+    - MOLECULE_DISTRO: ubuntu1804
+      MOLECULE_PLAYBOOK: playbook-7.2.yml
+    - MOLECULE_DISTRO: ubuntu1604
+      MOLECULE_PLAYBOOK: playbook-7.2.yml
+    - MOLECULE_DISTRO: debian9
+      MOLECULE_PLAYBOOK: playbook-7.2.yml
 
-    # PHP 5.6
-    - distro: centos7
-      playbook: test-5.6.yml
-      php_version: "5.6"
-    - distro: ubuntu1804
-      playbook: test-5.6.yml
-      php_version: "5.6"
+    # PHP 5.6.
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
+      MOLECULE_PLAYBOOK: playbook-5.6.yml
+    - MOLECULE_DISTRO: ubuntu1804
+      MOLECULE_PLAYBOOK: playbook-5.6.yml
+
+install:
+  # Install test dependencies.
+  - pip install molecule docker
+
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
 script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
-
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
-
   # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Run script to test PHP version.
-  - 'docker exec ${container_id} env TERM=xterm php -v | grep -F "${php_version}."'
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/

README.md

@@ -16,7 +16,7 @@ Available variables are listed below, along with default values (see `defaults/m
 
 The PHP version to be installed. Any [currently-supported PHP major version](http://php.net/supported-versions.php) is a valid option (e.g. `5.6`, `7.0`, `7.1`, etc.
 
-    php_versions_install_recommends: no
+    php_versions_install_recommends: false
 
 (For Debian OSes only) Whether to install recommended packages. This is set to `no` by default because setting it to `yes` often leads to multiple PHP versions being installed (thus making a bit of a mess) when using repos like Ondrej's PHP PPA for Ubuntu.
 

defaults/main.yml

@@ -3,4 +3,4 @@
 php_version: '7.1'
 
 # For Debian OSes only.
-php_versions_install_recommends: no
+php_versions_install_recommends: false

molecule/default/molecule.yml

@@ -0,0 +1,27 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
+    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8

molecule/default/playbook-5.6.yml

@@ -0,0 +1,24 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  vars:
+    php_enable_webserver: false
+    php_version: '5.6'
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=true cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
+    - role: geerlingguy.php-versions
+    - role: geerlingguy.php
+
+  post_tasks:
+    - name: Confirm PHP version is correct.
+      shell: "php -v | grep -F '{{ php_version }}'"
+      changed_when: false

molecule/default/playbook-7.2.yml

@@ -0,0 +1,24 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  vars:
+    php_enable_webserver: false
+    php_version: '7.2'
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=true cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
+    - role: geerlingguy.php-versions
+    - role: geerlingguy.php
+
+  post_tasks:
+    - name: Confirm PHP version is correct.
+      shell: "php -v | grep -F '{{ php_version }}'"
+      changed_when: false

molecule/default/playbook.yml

@@ -0,0 +1,24 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  vars:
+    php_enable_webserver: false
+    php_version: '7.1'
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=true cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
+    - role: geerlingguy.php-versions
+    - role: geerlingguy.php
+
+  post_tasks:
+    - name: Confirm PHP version is correct.
+      shell: "php -v | grep -F '{{ php_version }}'"
+      changed_when: false

molecule/default/tests/test_default.py

@@ -0,0 +1,14 @@
+import os
+
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+
+
+def test_hosts_file(host):
+    f = host.file('/etc/hosts')
+
+    assert f.exists
+    assert f.user == 'root'
+    assert f.group == 'root'

molecule/default/yaml-lint.yml

@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 120
+    level: warning

tasks/setup-Debian.yml

@@ -17,10 +17,10 @@
 # Debian-specific tasks.
 - name: Add dependencies for PHP versions (Debian).
   apt:
-    name: "{{ item }}"
-  with_items:
+    name:
       - apt-transport-https
       - ca-certificates
+    state: present
   when: ansible_distribution == "Debian"
 
 - name: Add Ondrej Sury's apt key (Debian).
@@ -37,19 +37,18 @@
   when: ansible_distribution == "Debian"
 
 - name: Update apt caches after repo is added (Debian).
-  apt: update_cache=yes
+  apt: update_cache=true
   when: php_ondrej_debian_repo.changed and (ansible_distribution == "Debian")
 
 # PHP package purges.
 - name: Purge PHP version packages.
   apt:
-    name: "{{ item }}"
-    state: absent
-    purge: yes
-    force: yes
-  when: "'php' + php_version not in item"
-  with_items:
+    name:
       - php5.6-common
       - php7.0-common
       - php7.1-common
       - php7.2-common
+    state: absent
+    purge: true
+    force: true
+  when: "'php' + php_version not in item"

tests/README.md

@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`

tests/test-5.6.yml

@@ -1,17 +0,0 @@
----
-- hosts: all
-
-  vars:
-    php_enable_webserver: false
-    php_version: "5.6"
-
-  pre_tasks:
-    - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
-      when: ansible_os_family == 'Debian'
-
-  roles:
-    - role: geerlingguy.repo-remi
-      when: ansible_os_family == 'RedHat'
-    - role_under_test
-    - geerlingguy.php

tests/test-7.2.yml

@@ -1,17 +0,0 @@
----
-- hosts: all
-
-  vars:
-    php_enable_webserver: false
-    php_version: "7.2"
-
-  pre_tasks:
-    - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
-      when: ansible_os_family == 'Debian'
-
-  roles:
-    - role: geerlingguy.repo-remi
-      when: ansible_os_family == 'RedHat'
-    - role_under_test
-    - geerlingguy.php

tests/test.yml

@@ -1,16 +0,0 @@
----
-- hosts: all
-
-  vars:
-    php_enable_webserver: false
-
-  pre_tasks:
-    - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
-      when: ansible_os_family == 'Debian'
-
-  roles:
-    - role: geerlingguy.repo-remi
-      when: ansible_os_family == 'RedHat'
-    - role_under_test
-    - geerlingguy.php

vars/Debian-php7.2.yml

@@ -1,3 +1,4 @@
+---
 __php_packages:
   - "php{{ php_version }}"
   - "php{{ php_version }}-apcu"

vars/Debian.yml

@@ -1,5 +1,5 @@
 ---
-# Configure PHP paths and packages for PHP 5.6 and PHP 7.0.
+# Configure PHP paths and packages.
 __php_conf_paths:
   - "/etc/php/{{ php_version }}/fpm"
   - "/etc/php/{{ php_version }}/apache2"