From cfe3aaea273c97941b912ce0b9e11764727234e8 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 2 Apr 2017 09:49:19 -0500
Subject: [PATCH] Switch to more efficient and compact test setup.

---
 .gitignore      |  2 ++
 .travis.yml     | 55 ++++++++++++-------------------------------------
 tests/README.md | 11 ++++++++++
 3 files changed, 26 insertions(+), 42 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 tests/README.md

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c9b2377
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh
diff --git a/.travis.yml b/.travis.yml
index 0c2146f..3d24685 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,79 +4,50 @@ services: docker
 env:
   # Test package install on all supported OSes.
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test.yml
     php_version: 7.0
   - distro: fedora24
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test.yml
     php_version: 5.6
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test.yml
     php_version: 7.0
   - distro: ubuntu1404
-    init: /sbin/init
-    run_opts: ""
     playbook: test.yml
     php_version: 7.0
   - distro: ubuntu1204
-    init: /sbin/init
-    run_opts: ""
     playbook: test.yml
     php_version: 5.6
 
   # Only test source install on latest supported OSes.
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test-source.yml
     php_version: 7.0.13
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test-source.yml
     php_version: 7.0.13
 
-before_install:
-  # Pull container.
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
-
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Install dependencies.
-  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --syntax-check'
-
-  # Test role.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}'
-
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
   # Ensure PHP is installed and at the right version.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm which php'
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm test -x /usr/bin/php'
+  - 'docker exec --tty ${container_id} env TERM=xterm which php'
+  - 'docker exec --tty ${container_id} env TERM=xterm test -x /usr/bin/php'
 
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm php --version'
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm /usr/bin/php --version | grep -qF "PHP ${php_version}"'
+  - 'docker exec --tty ${container_id} env TERM=xterm php --version'
+  - 'docker exec --tty ${container_id} env TERM=xterm /usr/bin/php --version | grep -qF "PHP ${php_version}"'
 
   # Ensure PHP configurations have taken effect.
-  - docker exec --tty "$(cat ${container_id})" env TERM=xterm php -i | grep 'memory_limit.*192'
+  - docker exec --tty ${container_id} env TERM=xterm php -i | grep 'memory_limit.*192'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/tests/README.md b/tests/README.md
new file mode 100644
index 0000000..6fb2117
--- /dev/null
+++ b/tests/README.md
@@ -0,0 +1,11 @@
+# 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)`