github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-14 14:14:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8949 from wainersm/tests_nydus

Browse Source 
tests/nydus: refactor the teardown()
This commit is contained in:
Wainer Moschetta 2024-02-27 09:52:44 -03:00 committed by GitHub
commit 6186410e35
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/integration/nydus/nydus_tests.sh
View File

@ -156,15 +156,21 @@ function run_test() {
function teardown() { function teardown() {
echo "Running teardown" echo "Running teardown"
local rc=0
# kill nydus-snapshotter local pid
bin=containerd-nydus-grpc for bin in containerd-nydus-grpc nydusd; do
sudo -E kill -9 $(pidof $bin) || true pid=$(pidof $bin)
[ "$(pidof $bin)" == "" ] || die "$bin is running" if [ -n "$pid" ]; then
echo "Killing $bin processes"
bin=nydusd # shellcheck disable=SC2086
sudo -E kill -9 $(pidof $bin) || true sudo -E kill -9 $pid || true
[ "$(pidof $bin)" == "" ] || die "$bin is running" if [ -n "$(pidof $bin)" ]; then
echo "$bin is still running ($pid) but it should not"
rc=1
fi
fi
done
# restore kata configuratiom.toml if needed # restore kata configuratiom.toml if needed
if [ "${need_restore_kata_config}" == "true" ]; then if [ "${need_restore_kata_config}" == "true" ]; then
@ -180,8 +186,9 @@ function teardown() {
sudo rm "$containerd_config" sudo rm "$containerd_config"
fi fi
clean_env_ctr clean_env_ctr || rc=1
check_processes check_processes
return $rc
} }
trap teardown EXIT trap teardown EXIT