chore(tests): Add more tests to increase coverage

Adds an integration test that talks to nsq

Author: Jonathan Chauncey

Makefile

@@ -31,6 +31,7 @@ IMAGE_PREFIX ?= deis
 include versioning.mk
 
 REDIS_CONTAINER_NAME := test-redis-${VERSION}
+NSQ_CONTAINER_NAME := test-nsq-${VERSION}
 
 SHELL_SCRIPTS = $(wildcard _scripts/*.sh)
 
@@ -78,15 +79,19 @@ update-manifests:
 
 test: test-style test-unit
 
-test-cover: start-test-redis
+test-cover: start-test-redis start-test-nsq
 	docker run ${DEV_ENV_OPTS} \
 		-it \
 		--link ${REDIS_CONTAINER_NAME}:TEST_REDIS \
-		${DEV_ENV_IMAGE} bash -c 'DEIS_LOGGER_REDIS_SERVICE_HOST=$$TEST_REDIS_PORT_6379_TCP_ADDR \
-		DEIS_LOGGER_REDIS_SERVICE_PORT=$$TEST_REDIS_PORT_6379_TCP_PORT \
-		test-cover.sh' \
-		|| (make stop-test-redis && false)
+		--link ${NSQ_CONTAINER_NAME}:TEST_NSQ \
+		${DEV_ENV_IMAGE} bash -c \
+		'DEIS_LOGGER_REDIS_SERVICE_HOST=$$TEST_REDIS_PORT_6379_TCP_ADDR \
+		 DEIS_LOGGER_REDIS_SERVICE_PORT=$$TEST_REDIS_PORT_6379_TCP_PORT \
+		 DEIS_NSQD_SERVICE_HOST=$$TEST_NSQ_PORT_4150_TCP_ADDR \
+		 DEIS_NSQD_SERVICE_PORT_TRANSPORT=$$TEST_NSQ_PORT_4150_TCP_PORT \
+		 test-cover.sh'
 	make stop-test-redis
+	make stop-test-nsq
 
 test-style: check-docker
 	${DEV_ENV_CMD} make style-check
@@ -104,21 +109,32 @@ style-check:
 	shellcheck $(SHELL_SCRIPTS)
 
 start-test-redis:
-	docker run --name ${REDIS_CONTAINER_NAME} -d redis:latest
+	docker run --name ${REDIS_CONTAINER_NAME} -d redis:latest || true
+
+start-test-nsq:
+	docker run --name ${NSQ_CONTAINER_NAME} -d nsqio/nsq nsqd || true
 
 stop-test-redis:
 	docker kill ${REDIS_CONTAINER_NAME}
 	docker rm ${REDIS_CONTAINER_NAME}
 
-test-unit: start-test-redis
+stop-test-nsq:
+	docker kill ${NSQ_CONTAINER_NAME}
+	docker rm ${NSQ_CONTAINER_NAME}
+
+test-unit: start-test-redis start-test-nsq
 	docker run ${DEV_ENV_OPTS} \
 		-it \
 		--link ${REDIS_CONTAINER_NAME}:TEST_REDIS \
-		${DEV_ENV_IMAGE} bash -c 'DEIS_LOGGER_REDIS_SERVICE_HOST=$$TEST_REDIS_PORT_6379_TCP_ADDR \
-		DEIS_LOGGER_REDIS_SERVICE_PORT=$$TEST_REDIS_PORT_6379_TCP_PORT \
-		$(GOTEST) -tags="testredis" $$(glide nv)' \
-		|| (make stop-test-redis && false)
+		--link ${NSQ_CONTAINER_NAME}:TEST_NSQ \
+		${DEV_ENV_IMAGE} bash -c \
+		'DEIS_LOGGER_REDIS_SERVICE_HOST=$$TEST_REDIS_PORT_6379_TCP_ADDR \
+		 DEIS_LOGGER_REDIS_SERVICE_PORT=$$TEST_REDIS_PORT_6379_TCP_PORT \
+		 DEIS_NSQD_SERVICE_HOST=$$TEST_NSQ_PORT_4150_TCP_ADDR \
+		 DEIS_NSQD_SERVICE_PORT_TRANSPORT=$$TEST_NSQ_PORT_4150_TCP_PORT \
+		 $(GOTEST) -tags="testredis" $$(glide nv)'
 	make stop-test-redis
+	make stop-test-nsq
 
 kube-install:
 	kubectl create -f manifests/deis-logger-svc.yaml

log/config_test.go

@@ -0,0 +1,44 @@
+package log
+
+import (
+	"os"
+	"strconv"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestNsqURL(t *testing.T) {
+	c := config{
+		NSQHost: "somehost",
+		NSQPort: 3333,
+	}
+	assert.Equal(t, c.nsqURL(), "somehost:3333")
+}
+
+func TestStopTimeoutDuration(t *testing.T) {
+	c := config{
+		StopTimeoutSeconds: 60,
+	}
+	assert.Equal(t, c.stopTimeoutDuration(), time.Duration(c.StopTimeoutSeconds)*time.Second)
+}
+
+func TestParseConfig(t *testing.T) {
+	os.Setenv("NSQ_TOPIC", "topic")
+	os.Setenv("NSQ_CHANNEL", "channel")
+	os.Setenv("NSQ_HANDLER_COUNT", "3")
+	os.Setenv("AGGREGATOR_STOP_TIMEOUT_SEC", "2")
+
+	port, err := strconv.Atoi(os.Getenv("DEIS_NSQD_SERVICE_PORT_TRANSPORT"))
+	assert.NoError(t, err)
+
+	c, err := parseConfig("foo")
+	assert.NoError(t, err)
+	assert.Equal(t, c.NSQHost, os.Getenv("DEIS_NSQD_SERVICE_HOST"))
+	assert.Equal(t, c.NSQPort, port)
+	assert.Equal(t, c.NSQTopic, "topic")
+	assert.Equal(t, c.NSQChannel, "channel")
+	assert.Equal(t, c.NSQHandlerCount, 3)
+	assert.Equal(t, c.StopTimeoutSeconds, 2)
+}

log/nsq_aggregator_test.go

@@ -0,0 +1,22 @@
+package log
+
+import (
+	"testing"
+
+	"github.com/deis/logger/storage"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestAggregator(t *testing.T) {
+	storageAdapter, err := storage.NewAdapter("memory", 100)
+	assert.NoError(t, err)
+	aggregator, err := NewAggregator("nsq", storageAdapter)
+	assert.NoError(t, err)
+	err = aggregator.Listen()
+	assert.NoError(t, err)
+	stoppedCh := aggregator.Stopped()
+	err = aggregator.Stop()
+	assert.NoError(t, err)
+	stopErr := <-stoppedCh
+	assert.NoError(t, stopErr, "Aggregator stopped with error")
+}

storage/redis_config_test.go

@@ -0,0 +1,38 @@
+package storage
+
+import (
+	"os"
+	"strconv"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestParseConfig(t *testing.T) {
+	host := os.Getenv("DEIS_LOGGER_REDIS_SERVICE_HOST")
+	password := os.Getenv("DEIS_LOGGER_REDIS_PASSWORD")
+	db := os.Getenv("DEIS_LOGGER_REDIS_DB")
+	pipelineLength := os.Getenv("DEIS_LOGGER_REDIS_PIPELINE_LENGTH")
+	pipelineTimeoutSeconds := os.Getenv("DEIS_LOGGER_REDIS_PIPELINE_TIMEOUT_SECONDS")
+
+	os.Setenv("DEIS_LOGGER_REDIS_PASSWORD", "password")
+	os.Setenv("DEIS_LOGGER_REDIS_DB", "2")
+	os.Setenv("DEIS_LOGGER_REDIS_PIPELINE_LENGTH", "1")
+	os.Setenv("DEIS_LOGGER_REDIS_PIPELINE_TIMEOUT_SECONDS", "2")
+
+	p, err := strconv.Atoi(os.Getenv("DEIS_LOGGER_REDIS_SERVICE_PORT"))
+	assert.NoError(t, err)
+
+	c, err := parseConfig("foo")
+	assert.NoError(t, err, "error parsing config")
+	assert.Equal(t, c.Host, host)
+	assert.Equal(t, c.Port, p)
+	assert.Equal(t, c.Password, "password")
+	assert.Equal(t, c.PipelineLength, 1)
+	assert.Equal(t, c.PipelineTimeoutSeconds, 2)
+
+	os.Setenv("DEIS_LOGGER_REDIS_PASSWORD", password)
+	os.Setenv("DEIS_LOGGER_REDIS_DB", db)
+	os.Setenv("DEIS_LOGGER_REDIS_PIPELINE_LENGTH", pipelineLength)
+	os.Setenv("DEIS_LOGGER_REDIS_PIPELINE_TIMEOUT_SECONDS", pipelineTimeoutSeconds)
+}