Skip to content

Commit

Permalink
FAB-10236 improve integration-test target
Browse files Browse the repository at this point in the history
The Makefile's 'integration-test' target unnecessarily
builds all the docker images as a dependency. It also
cleans them all, which compounds issues. The only one
it might possibly need is ccenv because the tests
may spin up chaincode.

Also, go test ./... does not correctly handle all tests.
A more correct approach would be to exec go test or ginkgo
from each directory in which there is a suite.

Need to ensure 3rd party images d/l'ed

Change-Id: I8a5c713108c339842471f6415e79924dba7b7964
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
  • Loading branch information
christo4ferris committed May 20, 2018
1 parent b1b43e4 commit 7984961
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ $(BUILD_DIR)/image/testenv/$(DUMMY): $(BUILD_DIR)/image/buildenv/$(DUMMY)
testenv: $(BUILD_DIR)/image/testenv/$(DUMMY)
ccenv: $(BUILD_DIR)/image/ccenv/$(DUMMY)

integration-test: docker-clean docker testenv ccenv
cd integration && go test ./...
integration-test: ccenv docker-thirdparty
find ./integration -name "*suite_test.go" -execdir go test -cover \;

unit-test: unit-test-clean peer-docker testenv ccenv
cd unit-test && docker-compose up --abort-on-container-exit --force-recreate && docker-compose down
Expand Down

0 comments on commit 7984961

Please sign in to comment.