github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Fix readiness check in test utils.

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu 2018-09-26 00:38:43 -07:00
parent 733f7199b2
commit 68152dab84
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hack/test-utils.sh
View File

@ -35,7 +35,7 @@ containerd_pid=
test_setup() { test_setup() {
local report_dir=$1 local report_dir=$1
# Start containerd # Start containerd
if [ ! -x ${ROOT}/_output/containerd ]; then if [ ! -x "${ROOT}/_output/containerd" ]; then
echo "containerd is not built" echo "containerd is not built"
exit 1 exit 1
fi fi
@ -45,8 +45,18 @@ test_setup() {
containerd_pid=$! containerd_pid=$!
# Wait for containerd to be running by using the containerd client ctr to check the version # Wait for containerd to be running by using the containerd client ctr to check the version
# of the containerd server. Wait an increasing amount of time after each of five attempts # of the containerd server. Wait an increasing amount of time after each of five attempts
readiness_check "sudo ctr version" local -r ctr_path=$(which ctr)
readiness_check "sudo crictl --runtime-endpoint=${CONTAINERD_SOCK} info" if [ -z "${ctr_path}" ]; then
echo "ctr is not in PATH"
exit 1
fi
local -r crictl_path=$(which crictl)
if [ -z "${crictl_path}" ]; then
echo "crictl is not in PATH"
exit 1
fi
readiness_check "sudo ${ctr_path} version"
readiness_check "sudo ${crictl_path} --runtime-endpoint=${CONTAINERD_SOCK} info"
} }
# test_teardown kills containerd. # test_teardown kills containerd.