ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 12:53:59 +03:00
Code Issues Projects Releases Wiki Activity

lib.filesystem.pathType: Fix tests for Nix >= 2.14

Browse Source
This commit is contained in:
Silvan Mosberger 2023-05-25 22:39:28 +02:00
parent 499cad7a72
commit 04db3589a8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/tests/filesystem.sh
View File

@ -41,7 +41,7 @@ checkPathType() {
local actualPathType=$(nix-instantiate --eval --strict --json 2>&1 \ local actualPathType=$(nix-instantiate --eval --strict --json 2>&1 \
-E '{ path }: let lib = import <nixpkgs/lib>; in lib.filesystem.pathType path' \ -E '{ path }: let lib = import <nixpkgs/lib>; in lib.filesystem.pathType path' \
--argstr path "$path") --argstr path "$path")
if [[ "$actualPathType" != "$expectedPathType" ]]; then if [[ ! "$actualPathType" =~ $expectedPathType ]]; then
die "lib.filesystem.pathType \"$path\" == $actualPathType, but $expectedPathType was expected" die "lib.filesystem.pathType \"$path\" == $actualPathType, but $expectedPathType was expected"
fi fi
} }
@ -51,7 +51,8 @@ checkPathType "$PWD/directory" '"directory"'
checkPathType "$PWD/regular" '"regular"' checkPathType "$PWD/regular" '"regular"'
checkPathType "$PWD/symlink" '"symlink"' checkPathType "$PWD/symlink" '"symlink"'
checkPathType "$PWD/fifo" '"unknown"' checkPathType "$PWD/fifo" '"unknown"'
checkPathType "$PWD/non-existent" "error: evaluation aborted with the following error message: 'lib.filesystem.pathType: Path $PWD/non-existent does not exist.'" # Different errors depending on whether the builtins.readFilePath primop is available or not
checkPathType "$PWD/non-existent" "error: (evaluation aborted with the following error message: 'lib.filesystem.pathType: Path $PWD/non-existent does not exist.'|getting status of '$PWD/non-existent': No such file or directory)"
checkPathIsDirectory() { checkPathIsDirectory() {
local path=$1 local path=$1