From 7357d346c40a7eb57edccbd1bc29c6d324e14044 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 11 Apr 2018 13:31:18 -0400 Subject: [PATCH] tests: Better error message if target is not a symlink I broke the code for this and ended up adding this to debug it. Closes: #1535 Approved by: jlebon --- tests/admin-test.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/admin-test.sh b/tests/admin-test.sh index b546e142..6e3fd782 100644 --- a/tests/admin-test.sh +++ b/tests/admin-test.sh @@ -147,8 +147,13 @@ ln -s /ENOENT sysroot/ostree/deploy/testos/deploy/${rev}.3/etc/a-new-broken-syml ${CMD_PREFIX} ostree admin deploy --retain --os=testos testos:testos/buildmaster/x86_64-runtime assert_not_has_dir sysroot/boot/loader.0 assert_has_dir sysroot/boot/loader.1 -linktarget=$(readlink sysroot/ostree/deploy/testos/deploy/${rev}.4/etc/a-new-broken-symlink) -test "${linktarget}" = /ENOENT +link=sysroot/ostree/deploy/testos/deploy/${rev}.4/etc/a-new-broken-symlink +if ! test -L ${link}; then + ls -al ${link} + fatal "Not a symlink: ${link}" +fi +linktarget=$(readlink ${link}) +assert_streq "${linktarget}" /ENOENT assert_file_has_content sysroot/ostree/deploy/testos/deploy/${rev}.3/etc/os-release 'NAME=TestOS' assert_file_has_content sysroot/ostree/deploy/testos/deploy/${rev}.4/etc/os-release 'NAME=TestOS' assert_file_has_content sysroot/ostree/deploy/testos/deploy/${rev}.4/etc/a-new-config-file 'a new local config file'