test: Clean agent directories on disk before functional test runs, not after

This is primarily so CI tooling can capture the agent logs after the functional tester runs.
release-3.3
Joe Betz 2017-11-14 12:17:15 -08:00 committed by Gyu-Ho Lee
parent 6f077bd74c
commit 1bca2e969f
2 changed files with 4 additions and 1 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/agent-*
/coverage
/covdir
/gopath

4
test
View File

@ -109,6 +109,9 @@ function integration_extra {
}
function functional_pass {
# Clean up any data and logs from previous runs
rm -rf ./agent-*
for a in 1 2 3; do
mkdir -p ./agent-$a
./bin/etcd-agent -etcd-path ./bin/etcd -etcd-log-dir "./agent-$a" -port ":${a}9027" -use-root=false &
@ -138,7 +141,6 @@ function functional_pass {
agent_pids=($agent_pids)
kill -s TERM "${agent_pids[@]}"
for a in "${agent_pids[@]}"; do wait "$a" || true; done
rm -rf ./agent-*
if [[ "${ETCD_TESTER_EXIT_CODE}" -ne "0" ]]; then
echo "--- FAIL: exit code" ${ETCD_TESTER_EXIT_CODE}