From a52b98c70e84b3fee37e6b0122e3283a8e7d603f Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Tue, 14 Nov 2017 12:25:52 -0600 Subject: [PATCH 1/3] update deps --- glide.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/glide.lock b/glide.lock index 755521863..80dbc4835 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ hash: 5501ab3d7136aa8fb425c995d45221849b33aefab76c5d2c192e721dad28da38 -updated: 2017-11-08T22:19:19.433856551Z +updated: 2017-11-14T18:23:41.2024073Z imports: - name: github.com/btcsuite/btcd version: b8df516b4b267acf2de46be593a9d948d1d2c420 @@ -68,13 +68,13 @@ imports: - name: github.com/tendermint/go-crypto version: b4f04f196cd719660e43b91202cd60d9a95b1837 - name: github.com/tendermint/go-wire - version: 2baffcb6b690057568bc90ef1d457efb150b979a + version: 1c96861c03231361546944d883d99593b2e6b408 subpackages: - data - name: github.com/tendermint/iavl version: 595f3dcd5b6cd4a292e90757ae6d367fd7a6e653 - name: github.com/tendermint/tmlibs - version: 176c2ceed611d7735e39131e312bd973afb41b7b + version: 2442a0a698d271d5cf5d6a8e7c1db20335e959c1 subpackages: - common - db From f2bf7d1b2d2552391ad1ea999346e7772d5d6cff Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Tue, 14 Nov 2017 12:26:01 -0600 Subject: [PATCH 2/3] update go version to 1.9.2 --- scripts/abci-builder/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/abci-builder/Dockerfile b/scripts/abci-builder/Dockerfile index c56fb2ea8..1182085b4 100644 --- a/scripts/abci-builder/Dockerfile +++ b/scripts/abci-builder/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.7.4 +FROM golang:1.9.2 RUN apt-get update && apt-get install -y --no-install-recommends \ zip \ From 1d49453ffb63dab9568d8333b75b8fd8b0f4b177 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Tue, 14 Nov 2017 12:53:40 -0600 Subject: [PATCH 3/3] fix integration tests (Fixes #131) --- Makefile | 6 +++--- tests/test_app/app.go | 2 +- tests/test_app/test.sh | 2 +- tests/test_cli/test.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index a22a2e902..6c99e3639 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ GOTOOLS = \ all: protoc install test -NOVENDOR = go list github.com/tendermint/abci/... | grep -v /vendor/ +PACKAGES=$(shell go list ./... | grep -v '/vendor/') install-protoc: # Download: https://github.com/google/protobuf/releases @@ -27,7 +27,7 @@ dist: # test.sh requires that we run the installed cmds, must not be out of date test: install find . -path ./vendor -prune -o -name *.sock -exec rm {} \; - @ go test -p 1 `${NOVENDOR}` + @ go test $(PACKAGES) @ bash tests/test.sh fmt: @@ -36,7 +36,7 @@ fmt: test_integrations: get_vendor_deps install test get_deps: - @ go get -d `${NOVENDOR}` + @ go get -d $(PACKAGES) tools: go get -u -v $(GOTOOLS) diff --git a/tests/test_app/app.go b/tests/test_app/app.go index 7fc3ace0a..127ba78f7 100644 --- a/tests/test_app/app.go +++ b/tests/test_app/app.go @@ -18,7 +18,7 @@ func startApp(abciApp string) *process.Process { proc, err := process.StartProcess("abci_app", "", "bash", - []string{"-c", abciApp}, + []string{"-c", fmt.Sprintf("abci-cli %s", abciApp)}, nil, os.Stdout, ) diff --git a/tests/test_app/test.sh b/tests/test_app/test.sh index 0620b4767..5b523fefe 100755 --- a/tests/test_app/test.sh +++ b/tests/test_app/test.sh @@ -15,7 +15,7 @@ cd "$DIR" ABCI_APP="counter" go run ./*.go # test golang counter via grpc -ABCI_APP="counter -abci=grpc" ABCI="grpc" go run ./*.go +ABCI_APP="counter --abci=grpc" ABCI="grpc" go run ./*.go # test nodejs counter # TODO: fix node app diff --git a/tests/test_cli/test.sh b/tests/test_cli/test.sh index 81b06a0ec..ea4ea4fa9 100644 --- a/tests/test_cli/test.sh +++ b/tests/test_cli/test.sh @@ -17,7 +17,7 @@ function testExample() { $APP &> /dev/null & sleep 2 abci-cli --verbose batch < "$INPUT" > "${INPUT}.out.new" - killall $3 + killall "$3" pre=$(shasum < "${INPUT}.out") post=$(shasum < "${INPUT}.out.new")