fix integration tests (Fixes #131)
This commit is contained in:
parent
f2bf7d1b2d
commit
1d49453ffb
6
Makefile
6
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)
|
||||
|
|
|
@ -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,
|
||||
)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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")
|
||||
|
|
Loading…
Reference in New Issue