Skip to content
This repository has been archived by the owner on Oct 26, 2019. It is now read-only.

Commit

Permalink
Remove build as an implicit dep
Browse files Browse the repository at this point in the history
For integration tests

(c) Copyright IBM Corp. 2016
  • Loading branch information
parente committed May 18, 2016
1 parent 1b94d24 commit a44864d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
- docker

script:
- make test integration-test
- make build test integration-test

notifications:
email:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.server
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ USER root

# Install Xvfb and its dependencies needed to run Electron (Nightmare tests)
RUN apt-get update && \
apt-get install -y \
apt-get -qq install -y \
libgtk2.0-0 \
libgconf-2-4 \
libasound2 \
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ logging-container: demo-container ## Run dashboard server with node debugger in

############### Unit and integration tests

test: | build ## Run unit tests
test: ## Run unit tests
docker run -it --rm \
--name $(TEST_CONTAINER_NAME) \
$(TEST_IMAGE_NAME) test
Expand All @@ -156,7 +156,7 @@ $(DASHBOARD_SERVER) -d \
@echo '-- Waiting 10 seconds for servers to start'
@sleep 10
@echo '-- Starting test container'
@docker run -it --rm \
docker run -it --rm \
--name $(TEST_CONTAINER_NAME) \
-e APP_URL=http://$(DASHBOARD_CONTAINER_NAME):$(HTTP_PORT) \
-e KERNEL_GATEWAY_URL=http://$(KG_CONTAINER_NAME):8888 \
Expand Down

0 comments on commit a44864d

Please sign in to comment.