Merge pull request #378 from prometheus/add-e2e-tests-makefile

Add e2e tests makefile
This commit is contained in:
Johannes 'fish' Ziemke 2016-12-21 18:33:38 +01:00 committed by GitHub
commit e681dcc296
2 changed files with 12 additions and 7 deletions

View file

@ -21,7 +21,7 @@ DOCKER_IMAGE_NAME ?= node-exporter
DOCKER_IMAGE_TAG ?= $(subst /,-,$(shell git rev-parse --abbrev-ref HEAD)) DOCKER_IMAGE_TAG ?= $(subst /,-,$(shell git rev-parse --abbrev-ref HEAD))
all: format build test all: format build test test-e2e
style: style:
@echo ">> checking code style" @echo ">> checking code style"
@ -31,6 +31,10 @@ test:
@echo ">> running tests" @echo ">> running tests"
@$(GO) test -short $(pkgs) @$(GO) test -short $(pkgs)
test-e2e: build
@echo ">> running end-to-end tests"
./end-to-end-test.sh
format: format:
@echo ">> formatting code" @echo ">> formatting code"
@$(GO) fmt $(pkgs) @$(GO) fmt $(pkgs)
@ -57,4 +61,4 @@ promu:
$(GO) get -u github.com/prometheus/promu $(GO) get -u github.com/prometheus/promu
.PHONY: all style format build test vet tarball docker promu .PHONY: all style format build test test-e2e vet tarball docker promu

View file

@ -24,7 +24,6 @@ collectors=$(cat << COLLECTORS
megacli megacli
COLLECTORS COLLECTORS
) )
cd "$(dirname $0)" cd "$(dirname $0)"
port="$((10000 + (RANDOM % 10000)))" port="$((10000 + (RANDOM % 10000)))"
@ -74,11 +73,13 @@ fi
echo $! > "${tmpdir}/node_exporter.pid" echo $! > "${tmpdir}/node_exporter.pid"
finish() { finish() {
if [ ${verbose} -ne 0 ] if [ $? -ne 0 -o ${verbose} -ne 0 ]
then then
echo "LOG =====================" cat << EOF >&2
cat "${tmpdir}/node_exporter.log" LOG =====================
echo "=========================" $(cat "${tmpdir}/node_exporter.log")
=========================
EOF
fi fi
if [ ${update} -ne 0 ] if [ ${update} -ne 0 ]