Merge pull request #189 from mcuadros/integration

sdk: intregration-test now is self-contained
bblfsh · Oct 3, 2017 · 421904b · 421904b
2 parents 0f9f2d7 + 7dbae5f
commit 421904b
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/assets/build/bindata.go b/assets/build/bindata.go
diff --git a/etc/build/make/rules.mk b/etc/build/make/rules.mk
@@ -3,6 +3,9 @@ BUILD_PATH := $(location)/build
 RUN := $(sdklocation)/etc/run.sh
 RUN_VERBOSE := VERBOSE=1 $(RUN)
 
+GRPC_PORT := 9432
+GRPC_PORT_INTEGRATION ?= 39432
+
 # docker runtime commands
 DOCKER_CMD ?= docker
 DOCKER_BUILD ?= $(DOCKER_CMD) build
@@ -106,7 +109,12 @@ build-driver-internal: $(BUILD_PATH)
 	$(RUN) $(GO_CMD) build -o $(BUILD_PATH)/bin/driver .
 
 integration-test: build
-	@$(RUN_VERBOSE) $(bblfsh-sdk-tools) test
+	CONTAINER_ID=`$(DOCKER_CMD) run -d \
+		-p $(GRPC_PORT_INTEGRATION):$(GRPC_PORT) \
+		$(call unescape_docker_tag,$(DOCKER_IMAGE_VERSIONED))`; \
+	echo "CONTAINER_ID: $$CONTAINER_ID"; \
+	$(bblfsh-sdk-tools) test --endpoint localhost:$(GRPC_PORT_INTEGRATION) || true; \
+	docker kill $$CONTAINER_ID;
 
 push: build
 	$(if $(pushdisabled),$(error $(pushdisabled)))

diff --git a/sdk/driver/integration/suite_test.go b/sdk/driver/integration/suite_test.go
@@ -51,7 +51,7 @@ func (s *suite) SetUpTest(t *testing.T) {
 
 	r := require.New(t)
 	// TODO: use client-go as soon NativeParse request is availabe on it.
-	conn, err := grpc.Dial(s.Endpoint, grpc.WithTimeout(time.Second*2), grpc.WithInsecure())
+	conn, err := grpc.Dial(s.Endpoint, grpc.WithTimeout(time.Second*2), grpc.WithInsecure(), grpc.WithBlock())
 	r.Nil(err)
 
 	s.c = protocol.NewProtocolServiceClient(conn)

diff --git a/sdk/driver/server.go b/sdk/driver/server.go
@@ -79,7 +79,7 @@ func (s *Server) initialize() error {
 func (s *Server) initializeFlags() {
 	const (
 		defaultNetwork = "tcp"
-		defaultAddress = "localhost:9432"
+		defaultAddress = "0.0.0.0:9432"
 		defaultVerbose = "info"
 		defaultFormat  = "text"
 	)