Execute "long" unit tests using docker containers

fixes #293

Author: sparrc

Makefile

@@ -52,15 +52,25 @@ endif
 	docker run --name aerospike -p "3000:3000" -d aerospike
 	docker run --name nsq -p "4150:4150" -d nsqio/nsq /nsqd
 
+docker-run-circle:
+	docker run --name kafka \
+		-e ADVERTISED_HOST=localhost \
+		-e ADVERTISED_PORT=9092 \
+		-p "9092:9092" \
+		-d spotify/kafka
+	docker run --name opentsdb -p "4242:4242" -d petergrace/opentsdb-docker
+	docker run --name aerospike -p "3000:3000" -d aerospike
+	docker run --name nsq -p "4150:4150" -d nsqio/nsq /nsqd
+
 docker-kill:
 	-docker kill nsq aerospike redis opentsdb rabbitmq postgres memcached mysql kafka
 	-docker rm nsq aerospike redis opentsdb rabbitmq postgres memcached mysql kafka
 
 test: docker-kill prepare docker-run
 	# Sleeping for kafka leadership election, TSDB setup, etc.
 	sleep 60
-	# Setup SUCCESS, running tests
-	godep go test ./...
+	# SUCCESS, running tests
+	godep go test -race ./...
 
 test-short: prepare
 	$(GOBIN)/godep go test -short ./...

circle.yml

@@ -1,4 +1,6 @@
 machine:
+  services:
+    - docker
   post:
     - go version
     - go version | grep 1.5.1 || sudo rm -rf /usr/local/go
@@ -8,9 +10,8 @@ machine:
 
 dependencies:
   override:
-    - echo "Dummy override, so no Circle dependencies execute"
+    - docker info
 
 test:
   override:
     - bash scripts/circle-test.sh
-

plugins/mysql/mysql_test.go

@@ -28,18 +28,18 @@ func TestMysqlGeneratesMetrics(t *testing.T) {
 		prefix string
 		count  int
 	}{
-		{"commands", 147},
-		{"handler", 18},
+		{"commands", 138},
+		{"handler", 15},
 		{"bytes", 2},
-		{"innodb", 51},
+		{"innodb", 46},
 		{"threads", 4},
 		{"aborted", 2},
 		{"created", 3},
 		{"key", 7},
 		{"open", 7},
 		{"opened", 3},
 		{"qcache", 8},
-		{"table", 5},
+		{"table", 1},
 	}
 
 	intMetrics := []string{
@@ -57,6 +57,11 @@ func TestMysqlGeneratesMetrics(t *testing.T) {
 			}
 		}
 
+		if prefix.count >= count {
+			t.Errorf("Expected less than %d measurements with prefix %s, got %d",
+				prefix.count, prefix.prefix, count)
+		}
+
 		assert.Equal(t, prefix.count, count)
 	}
 

scripts/circle-test.sh

@@ -69,7 +69,9 @@ exit_if_fail godep go build -v ./...
 
 # Run the tests
 exit_if_fail godep go vet ./...
-exit_if_fail godep go test -short ./...
+exit_if_fail make docker-run-circle
+sleep 30
+exit_if_fail godep go test ./...
 
 # Build binaries
 build "linux" "amd64" $VERSION