diff options
author | Tobias Schmidt <ts@soundcloud.com> | 2015-10-16 15:39:12 -0400 |
---|---|---|
committer | Tobias Schmidt <ts@soundcloud.com> | 2015-10-16 18:53:44 -0400 |
commit | e782412a03ac950aef600f6f69dce1b9187ac245 (patch) | |
tree | fa5f9cd298880df99a11037ab35e681afa3215aa /end-to-end-test.sh | |
parent | 500340bdde00c5e0e08d77b7b2f7b652dbbe3633 (diff) | |
download | prometheus_node_collector-e782412a03ac950aef600f6f69dce1b9187ac245.tar.bz2 prometheus_node_collector-e782412a03ac950aef600f6f69dce1b9187ac245.tar.xz prometheus_node_collector-e782412a03ac950aef600f6f69dce1b9187ac245.zip |
Improve end-to-end test output
Diffstat (limited to 'end-to-end-test.sh')
-rwxr-xr-x | end-to-end-test.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/end-to-end-test.sh b/end-to-end-test.sh index fdfe480..aedc420 100755 --- a/end-to-end-test.sh +++ b/end-to-end-test.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/env bash | 1 | #!/usr/bin/env bash |
2 | 2 | ||
3 | set +euf +o pipefail | 3 | set -euf +o pipefail |
4 | 4 | ||
5 | cd "$(dirname $0)" | 5 | cd "$(dirname $0)" |
6 | 6 | ||
@@ -33,6 +33,11 @@ do | |||
33 | esac | 33 | esac |
34 | done | 34 | done |
35 | 35 | ||
36 | if [ ! -x ./node_exporter ] | ||
37 | then | ||
38 | echo './node_exporter not found. Consider running `go build` first.' >&2 | ||
39 | exit 1 | ||
40 | fi | ||
36 | 41 | ||
37 | ./node_exporter \ | 42 | ./node_exporter \ |
38 | -collector.procfs="collector/fixtures/proc" \ | 43 | -collector.procfs="collector/fixtures/proc" \ |
@@ -62,6 +67,7 @@ finish() { | |||
62 | then | 67 | then |
63 | kill -9 "$(cat ${tmpdir}/node_exporter.pid)" | 68 | kill -9 "$(cat ${tmpdir}/node_exporter.pid)" |
64 | # This silences the "Killed" message | 69 | # This silences the "Killed" message |
70 | set +e | ||
65 | wait "$(cat ${tmpdir}/node_exporter.pid)" > /dev/null 2>&1 | 71 | wait "$(cat ${tmpdir}/node_exporter.pid)" > /dev/null 2>&1 |
66 | rm -rf "${tmpdir}" | 72 | rm -rf "${tmpdir}" |
67 | fi | 73 | fi |