From 35f0720083ce548e6025ebcbaa5adb4142dd0d08 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Sun, 14 Aug 2022 15:51:09 -0700 Subject: [PATCH] e2e: basename the link when comparing --- test_e2e.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test_e2e.sh b/test_e2e.sh index 18ac4ff..e24f105 100755 --- a/test_e2e.sh +++ b/test_e2e.sh @@ -38,8 +38,8 @@ function assert_link_exists() { fi } -function assert_link_eq() { - if [[ $(readlink "$1") == "$2" ]]; then +function assert_link_basename_eq() { + if [[ $(basename $(readlink "$1")) == "$2" ]]; then return fi fail "link $1 does not point to '$2': $(readlink $1)" @@ -547,20 +547,20 @@ function e2e::readlink() { >> "$1" 2>&1 & sleep 3 assert_link_exists "$ROOT"/link - assert_link_eq "$ROOT"/link $(git -C "$REPO" rev-parse HEAD) + assert_link_basename_eq "$ROOT"/link $(git -C "$REPO" rev-parse HEAD) # Move HEAD forward echo "$FUNCNAME 2" > "$REPO"/file git -C "$REPO" commit -qam "$FUNCNAME 2" sleep 3 assert_link_exists "$ROOT"/link - assert_link_eq "$ROOT"/link $(git -C "$REPO" rev-parse HEAD) + assert_link_basename_eq "$ROOT"/link $(git -C "$REPO" rev-parse HEAD) # Move HEAD backward git -C "$REPO" reset -q --hard HEAD^ sleep 3 assert_link_exists "$ROOT"/link - assert_link_eq "$ROOT"/link $(git -C "$REPO" rev-parse HEAD) + assert_link_basename_eq "$ROOT"/link $(git -C "$REPO" rev-parse HEAD) } ##############################################