Merge pull request #609 from thockin/basename_link

e2e: basename the link when comparing
This commit is contained in:
Kubernetes Prow Robot 2022-08-15 01:38:14 -07:00 committed by GitHub
commit ffbaeffed8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions

View File

@ -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)
}
##############################################