github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

test: switch envoy integration tests to use pkill instead of ps+grep+awk+kill (#10097)

pull/10140/head
R.B. Boyer 2021-04-23 13:23:33 -05:00 committed by hc-github-team-consul-core
parent 380d151201
commit faad1b5261
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/integration/connect/envoy/helpers.bash
View File

@ -528,26 +528,11 @@ function docker_consul_exec {
docker_exec envoy_consul-${DC}_1 "$@" docker_exec envoy_consul-${DC}_1 "$@"
} }
function get_envoy_pid {
local BOOTSTRAP_NAME=$1
local DC=${2:-primary}
run ps aux
[ "$status" == 0 ]
echo "$output" 1>&2
PID="$(echo "$output" | grep "envoy -c /workdir/$DC/envoy/${BOOTSTRAP_NAME}-bootstrap.json" | awk '{print $1}')"
[ -n "$PID" ]
echo "$PID"
}
function kill_envoy { function kill_envoy {
local BOOTSTRAP_NAME=$1 local BOOTSTRAP_NAME=$1
local DC=${2:-primary} local DC=${2:-primary}
PID="$(get_envoy_pid $BOOTSTRAP_NAME "$DC")" pkill -TERM -f "envoy -c /workdir/$DC/envoy/${BOOTSTRAP_NAME}-bootstrap.json"
echo "PID = $PID"
kill -TERM $PID
} }
function must_match_in_statsd_logs { function must_match_in_statsd_logs {