test_e2e.sh: add quotes to to prevent word splitting
Fixes SC2046. Part of #891.
This commit is contained in:
parent
e7a8600806
commit
bfe0a0bc17
10
test_e2e.sh
10
test_e2e.sh
|
|
@ -69,7 +69,7 @@ function assert_link_exists() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function assert_link_basename_eq() {
|
function assert_link_basename_eq() {
|
||||||
if [[ $(basename $(readlink "$1")) == "$2" ]]; then
|
if [[ $(basename "$(readlink "$1")") == "$2" ]]; then
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
fail "$1 does not point to $2: $(readlink "$1")"
|
fail "$1 does not point to $2: $(readlink "$1")"
|
||||||
|
|
@ -279,7 +279,7 @@ function GIT_SYNC() {
|
||||||
${RM} \
|
${RM} \
|
||||||
--label git-sync-e2e="$RUNID" \
|
--label git-sync-e2e="$RUNID" \
|
||||||
--network="host" \
|
--network="host" \
|
||||||
-u git-sync:$(id -g) `# rely on GID, triggering "dubious ownership"` \
|
-u git-sync:"$(id -g)" `# rely on GID, triggering "dubious ownership"` \
|
||||||
-v "$ROOT":"$ROOT":rw \
|
-v "$ROOT":"$ROOT":rw \
|
||||||
-v "$REPO":"$REPO":ro \
|
-v "$REPO":"$REPO":ro \
|
||||||
-v "$REPO2":"$REPO2":ro \
|
-v "$REPO2":"$REPO2":ro \
|
||||||
|
|
@ -1024,20 +1024,20 @@ function e2e::readlink() {
|
||||||
&
|
&
|
||||||
wait_for_sync "${MAXWAIT}"
|
wait_for_sync "${MAXWAIT}"
|
||||||
assert_link_exists "$ROOT/link"
|
assert_link_exists "$ROOT/link"
|
||||||
assert_link_basename_eq "$ROOT/link" $(git -C "$REPO" rev-parse HEAD)
|
assert_link_basename_eq "$ROOT/link" "$(git -C "$REPO" rev-parse HEAD)"
|
||||||
|
|
||||||
# Move HEAD forward
|
# Move HEAD forward
|
||||||
echo "${FUNCNAME[0]} 2" > "$REPO/file"
|
echo "${FUNCNAME[0]} 2" > "$REPO/file"
|
||||||
git -C "$REPO" commit -qam "${FUNCNAME[0]} 2"
|
git -C "$REPO" commit -qam "${FUNCNAME[0]} 2"
|
||||||
wait_for_sync "${MAXWAIT}"
|
wait_for_sync "${MAXWAIT}"
|
||||||
assert_link_exists "$ROOT/link"
|
assert_link_exists "$ROOT/link"
|
||||||
assert_link_basename_eq "$ROOT/link" $(git -C "$REPO" rev-parse HEAD)
|
assert_link_basename_eq "$ROOT/link" "$(git -C "$REPO" rev-parse HEAD)"
|
||||||
|
|
||||||
# Move HEAD backward
|
# Move HEAD backward
|
||||||
git -C "$REPO" reset -q --hard HEAD^
|
git -C "$REPO" reset -q --hard HEAD^
|
||||||
wait_for_sync "${MAXWAIT}"
|
wait_for_sync "${MAXWAIT}"
|
||||||
assert_link_exists "$ROOT/link"
|
assert_link_exists "$ROOT/link"
|
||||||
assert_link_basename_eq "$ROOT/link" $(git -C "$REPO" rev-parse HEAD)
|
assert_link_basename_eq "$ROOT/link" "$(git -C "$REPO" rev-parse HEAD)"
|
||||||
}
|
}
|
||||||
|
|
||||||
##############################################
|
##############################################
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue