h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-29 18:51:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

tests: make realpath tests easier to debug

Browse Source 
- Use the different strings for different checks to more easily narrow down
where a failure happens
- Move CHECK comments outside a `if...else...end` to avoid giving the impression
that the check only runs in the `if` case.

Part of #12171
This commit is contained in:
Nahor
2025-12-16 09:22:30 -08:00
committed by Johannes Altmanninger
parent 467b03d715
commit 52495c8124
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/checks/realpath.fish
View File

@@ -61,20 +61,20 @@ set -l real_path (builtin realpath $XDG_DATA_HOME/fish-symlink)
set -l expected_real_path "$data_home_realpath/fish"
if test "$real_path" = "$expected_real_path"
echo "fish-symlink handled correctly"
# CHECK: fish-symlink handled correctly
else
echo "fish-symlink not handled correctly: $real_path != $expected_real_path" >&2
end
# CHECK: fish-symlink handled correctly
# With "-s" the symlink is not resolved.
set -l real_path (builtin realpath -s $data_home_realpath/fish-symlink)
set -l expected_real_path "$data_home_realpath/fish-symlink"
if test "$real_path" = "$expected_real_path"
echo "fish-symlink handled correctly"
# CHECK: fish-symlink handled correctly
echo "fish-symlink with -s handled correctly"
else
echo "fish-symlink not handled correctly: $real_path != $expected_real_path" >&2
echo "fish-symlink with -s not handled correctly: $real_path != $expected_real_path" >&2
end
# CHECK: fish-symlink with -s handled correctly
# But the $PWD is still resolved
set -l oldpwd $PWD
@@ -82,21 +82,21 @@ cd $XDG_DATA_HOME/fish-symlink
set -l real_path (builtin realpath -s $data_home_realpath/fish-symlink)
set -l expected_real_path "$data_home_realpath/fish-symlink"
if test "$real_path" = "$expected_real_path"
echo "fish-symlink handled correctly"
# CHECK: fish-symlink handled correctly
echo "fish-symlink after cd handled correctly"
else
echo "fish-symlink not handled correctly: $real_path != $expected_real_path" >&2
echo "fish-symlink after cd not handled correctly: $real_path != $expected_real_path" >&2
end
# CHECK: fish-symlink after cd handled correctly
cd $oldpwd
set -l real_path (builtin realpath -s .)
set -l expected_real_path (pwd -P) # Physical working directory.
if test "$real_path" = "$expected_real_path"
echo "relative path correctly handled"
# CHECK: relative path correctly handled
else
echo "relative path not handled correctly: $real_path != $expected_real_path" >&2
end
# CHECK: relative path correctly handled
test (builtin realpath -s /usr/bin/../) = /usr
or echo builtin realpath -s does not resolve .. or resolves symlink wrong
@@ -107,10 +107,10 @@ set -l real_path (builtin realpath $XDG_DATA_HOME/fish-symlink/nonexistent-file-
set -l expected_real_path "$data_home_realpath/fish/nonexistent-file-relative-to-a-symlink"
if test "$real_path" = "$expected_real_path"
echo "fish-symlink/nonexistent-file-relative-to-a-symlink correctly converted"
# CHECK: fish-symlink/nonexistent-file-relative-to-a-symlink correctly converted
else
echo "failure nonexistent-file-relative-to-a-symlink: $real_path != $expected_real_path" >&2
end
# CHECK: fish-symlink/nonexistent-file-relative-to-a-symlink correctly converted
# We remove leading slashes even with "-s".
# This is how GNU realpath -s behaves, and also e.g.
@@ -129,10 +129,10 @@ set -l real_path (builtin realpath $XDG_DATA_HOME/fish-symlink/symlink_file)
set -l expected_real_path "$data_home_realpath/fish/real_file"
if test "$real_path" = "$expected_real_path"
echo "fish-symlink/symlink_file handled correctly"
# CHECK: fish-symlink/symlink_file handled correctly
else
echo "fish-symlink/symlink_file not handled correctly: $real_path != expected_real_path" >&2
end
# CHECK: fish-symlink/symlink_file handled correctly
builtin realpath / /
# CHECK: /