Merge pull request #21875 from Luap99/mount-test

test/system: fix mount external container test
This commit is contained in:
openshift-merge-bot[bot] 2024-02-29 14:58:09 +00:00 committed by GitHub
commit 98d1ad5a22
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 6 deletions

View File

@ -249,13 +249,10 @@ EOF
reported_mountpoint=$(echo "$output" | awk '{print $2}')
is "$reported_mountpoint" "$mount_path" "mountpoint reported by 'podman mount'"
# umount, and make sure files are gone
# umount, and make sure mountpoint no longer exists
run_podman umount $external_cid
if [ -d "$mount_path" ]; then
# Under VFS, mountpoint always exists even despite umount
if [[ "$(podman_storage_driver)" != "vfs" ]]; then
die "'podman umount' did not umount $mount_path"
fi
if findmnt "$mount_path" >/dev/null ; then
die "'podman umount' did not umount $mount_path"
fi
buildah rm $external_cid
}