Add bats QA tests

.travis.yml

@@ -1,17 +1,22 @@
 sudo: required
 
-services:  
+services:
     - docker
 
-env:  
+env:
     global:
         - DOCKER_VERSION=1.10.1-0~trusty
         - DOCKER_COMPOSE_VERSION=1.7.1
 
-before_install:  
+before_install:
     # list docker-engine versions
     - apt-cache madison docker-engine
 
+    # add bats repo https://github.com/tkuchiki/bats-travis-ci
+    - sudo add-apt-repository ppa:duggan/bats --yes
+    - sudo apt-get update -qq
+    - sudo apt-get install -qq bats
+
     # upgrade docker-engine to specific version
     - sudo apt-get -o Dpkg::Options::="--force-confnew" install -y docker-engine=${DOCKER_VERSION}
 
@@ -20,9 +25,10 @@ before_install:
     - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
     - chmod +x docker-compose
     - sudo mv docker-compose /usr/local/bin
+    - docker pull appropriate/curl:latest
 
-script:  
-    - docker-compose build
+script:
+    - bats test/test.full.bats
 
 notifications:
   email: false

Dockerfile

@@ -3,7 +3,7 @@ FROM debian:jessie
 MAINTAINER Alt Three <support@alt-three.com>
 
 ARG cachet_ver
-ENV cachet_ver v2.3.0-RC2
+ENV cachet_ver v2.3.0-RC5
 
 # Using debian packages instead of compiling from scratch
 RUN DEBIAN_FRONTEND=noninteractive \

conf/nginx-site.conf

@@ -1,5 +1,5 @@
 server {
-    listen 8000 default; ## Listen for ipv4; this line is default and implied
+    listen 80 default; ## Listen for ipv4; this line is default and implied
 
     # Make site accessible from http://localhost/
     server_name localhost;

docker-compose.yml

@@ -4,9 +4,9 @@ services:
   nginx:
     image: nginx:stable-alpine
     volumes:
-      - ./docker/nginx-site.conf:/etc/nginx/conf.d/default.conf
+      - ./conf/nginx-site.conf:/etc/nginx/conf.d/default.conf
     ports:
-      - 80:8000
+      - 80:80
     links:
       - cachet
     volumes_from:

test/docker_helpers.bash

@@ -0,0 +1,66 @@
+## functions to help deal with docker
+
+# Removes container $1
+function docker_clean {
+	docker kill $1 &>/dev/null ||:
+	sleep .25s
+	docker rm -vf $1 &>/dev/null ||:
+	sleep .25s
+}
+
+# get the ip of docker container $1
+function docker_ip {
+	docker inspect --format '{{ .NetworkSettings.Networks.docker_default.IPAddress }}' $1
+}
+
+# get the id of docker container $1
+function docker_id {
+	docker inspect --format '{{ .ID }}' $1
+}
+
+# get the running state of container $1
+# → true/false
+# fails if the container does not exist
+function docker_running_state {
+	docker inspect -f {{.State.Running}} $1
+}
+
+# get the docker container $1 PID
+function docker_pid {
+	docker inspect --format {{.State.Pid}} $1
+}
+
+# asserts logs from container $1 contains $2
+function docker_assert_log {
+	local -r container=$1
+	shift
+	run docker logs $container
+	assert_output -p "$*"
+}
+
+# wait for a container to produce a given text in its log
+# $1 container
+# $2 timeout in second
+# $* text to wait for
+function docker_wait_for_log {
+	local -r container=$1
+	local -ir timeout_sec=$2
+	shift 2
+	retry $(( $timeout_sec * 2 )) .5s docker_assert_log $container "$*"
+}
+
+# Create a docker container named $1 which exposes the docker host unix
+# socket over tcp on port 2375.
+#
+# $1 container name
+function docker_tcp {
+	local container_name="$1"
+	docker_clean $container_name
+	docker run -d \
+		--label bats-type="socat" \
+		--name $container_name \
+		--expose 2375 \
+		-v /var/run/docker.sock:/var/run/docker.sock \
+		rancher/socat-docker
+	docker run --label bats-type="docker" --link "$container_name:docker" docker:1.10 version
+}