From 2f3ee0e2e3b1c80004233432fc19b89029f7d350 Mon Sep 17 00:00:00 2001 From: Penn Bauman Date: Fri, 17 Nov 2023 13:06:29 -0500 Subject: [PATCH] test/system: Don't assume that no container will have /etc/kernel Any image or container that has APT or systemd may have /etc/kernel. eg., the arch-toolbox and ubuntu-toolbox images. https://github.com/containers/toolbox/pull/1409 Signed-off-by: Penn Bauman --- test/system/104-run.bats | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test/system/104-run.bats b/test/system/104-run.bats index ca68df0ca..ff11a8477 100644 --- a/test/system/104-run.bats +++ b/test/system/104-run.bats @@ -255,15 +255,21 @@ teardown() { create_default_container - pushd /etc/kernel + local host_only_dir + host_only_dir="$(mktemp --directory /var/tmp/toolbox-test-XXXXXXXXXX)" + + pushd "$host_only_dir" run --separate-stderr "$TOOLBOX" run pwd popd + rm --force --recursive "$host_only_dir" + assert_success assert_line --index 0 "$HOME" assert [ ${#lines[@]} -eq 1 ] lines=("${stderr_lines[@]}") - assert_line --index $((${#stderr_lines[@]}-2)) "Error: directory /etc/kernel not found in container $default_container_name" + assert_line --index $((${#stderr_lines[@]}-2)) \ + "Error: directory $host_only_dir not found in container $default_container_name" assert_line --index $((${#stderr_lines[@]}-1)) "Using $HOME instead." assert [ ${#stderr_lines[@]} -gt 2 ] }