Merge pull request #30 from rafaeljesus/feature/improve-execution-of-…

…integration-test

Improve make integration tests

Makefile

@@ -1,6 +1,6 @@
-.PHONY: all deps test
+.PHONY: all deps test integration-test-ci
 
-all: deps test
+all: deps test integration-test
 
 deps:
 	@go get -u github.com/golang/dep/cmd/dep
@@ -10,4 +10,11 @@ test:
 	@go test -v -race -cover
 
 integration-test:
+	@docker-compose up -d
+	@sleep 3
+	AMQP_DSN="amqp://guest:guest@`docker-compose port rabbit 5672`/" \
+		go test -v -cover integration/rabbus_integration_test.go -bench .
+	@docker-compose down -v
+
+integration-test-ci:
 	@go test -v -race -cover integration/rabbus_integration_test.go -bench .

circle.yml

@@ -2,7 +2,7 @@ machine:
   environment:
     IMPORT_PATH: "/home/ubuntu/.go_workspace/src/github.com/rafaeljesus"
     APP_PATH: "$IMPORT_PATH/rabbus"
-    RABBUS_DSN: "amqp://localhost:5672"
+    AMQP_DSN: "amqp://localhost:5672"
   services:
     - rabbitmq-server
 
@@ -16,4 +16,4 @@ dependencies:
 
 test:
   override:
-    - cd "$APP_PATH" && make test && make integration-test
+    - cd "$APP_PATH" && make test && make integration-test-ci

docker-compose.yml

@@ -1,11 +1,6 @@
-version: '2'
+version: '3'
 services:
-  rabbitmq:
-    container_name: dev_rabbitmq
-    image: rabbitmq:3.5.6-management
-    hostname: rabbitmq
+  rabbit:
+    image: rabbitmq:3.6-management-alpine
     ports:
-      - "5672:5672"
-      - "15672:15672"
-    volumes:
-      - ./data/rabbitmq:/var/lib/rabbitmq
+      - "5672"

integration/rabbus_integration_test.go

@@ -2,6 +2,7 @@ package rabbus
 
 import (
 	"context"
+	"os"
 	"strconv"
 	"sync"
 	"testing"
@@ -11,14 +12,21 @@ import (
 )
 
 const (
-	RABBUS_DSN = "amqp://localhost:5672"
+	amqpDsnEnv = "AMQP_DSN"
 )
 
 var (
+	amqpDsn string
 	timeout = time.After(3 * time.Second)
 )
 
 func TestRabbus(t *testing.T) {
+	if os.Getenv(amqpDsnEnv) == "" {
+		t.SkipNow()
+	}
+
+	amqpDsn = os.Getenv(amqpDsnEnv)
+
 	t.Parallel()
 
 	tests := []struct {
@@ -39,13 +47,17 @@ func TestRabbus(t *testing.T) {
 }
 
 func BenchmarkRabbus(b *testing.B) {
+	if os.Getenv(amqpDsnEnv) == "" {
+		b.SkipNow()
+	}
+
 	tests := []struct {
 		scenario string
 		function func(*testing.B)
 	}{
 		{
-			scenario: "rabbus emit async benchmark",
-			function: benchmarkEmitAsync,
+			"rabbus emit async benchmark",
+			benchmarkEmitAsync,
 		},
 	}
 
@@ -58,7 +70,7 @@ func BenchmarkRabbus(b *testing.B) {
 
 func testRabbusPublishSubscribe(t *testing.T) {
 	r, err := rabbus.New(
-		RABBUS_DSN,
+		amqpDsn,
 		rabbus.Durable(true),
 		rabbus.Attempts(5),
 		rabbus.BreakerTimeout(time.Second*2),
@@ -127,7 +139,7 @@ outer:
 
 func benchmarkEmitAsync(b *testing.B) {
 	r, err := rabbus.New(
-		RABBUS_DSN,
+		amqpDsn,
 		rabbus.Attempts(1),
 		rabbus.BreakerTimeout(time.Second*2),
 	)