From 6d4916a77c66c6881f2f7e15952c9982daec5878 Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Mon, 7 Aug 2023 19:56:27 -0700 Subject: [PATCH] Stop using `path sort` in some path tests Globs are already sorted, so this should be unnecessary. Remove these and add a test that we are sorted already. --- tests/checks/path.fish | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/tests/checks/path.fish b/tests/checks/path.fish index ea16f06bc..f8c326acc 100644 --- a/tests/checks/path.fish +++ b/tests/checks/path.fish @@ -143,59 +143,61 @@ chmod 300 stuff/writeexec chmod 700 stuff/all chmod 000 stuff/none -path filter --perm read stuff/* | path sort +# Validate that globs are sorted. +test (path filter stuff/* | path sort | string join ",") = (path filter stuff/* | string join ",") + +path filter --perm read stuff/* # CHECK: stuff/all # CHECK: stuff/read # CHECK: stuff/readexec # CHECK: stuff/readwrite -path filter -r stuff/* | path sort +path filter -r stuff/* # CHECK: stuff/all # CHECK: stuff/read # CHECK: stuff/readexec # CHECK: stuff/readwrite -path filter --perm write stuff/* | path sort +path filter --perm write stuff/* # CHECK: stuff/all # CHECK: stuff/readwrite # CHECK: stuff/write # CHECK: stuff/writeexec -path filter -w stuff/* | path sort +path filter -w stuff/* # CHECK: stuff/all # CHECK: stuff/readwrite # CHECK: stuff/write # CHECK: stuff/writeexec -path filter --perm exec stuff/* | path sort +path filter --perm exec stuff/* # CHECK: stuff/all # CHECK: stuff/exec # CHECK: stuff/readexec # CHECK: stuff/writeexec -path filter -x stuff/* | path sort +path filter -x stuff/* # CHECK: stuff/all # CHECK: stuff/exec # CHECK: stuff/readexec # CHECK: stuff/writeexec - -path filter --perm read,write stuff/* | path sort +path filter --perm read,write stuff/* # CHECK: stuff/all # CHECK: stuff/readwrite -path filter --perm read,exec stuff/* | path sort +path filter --perm read,exec stuff/* # CHECK: stuff/all # CHECK: stuff/readexec -path filter --perm write,exec stuff/* | path sort +path filter --perm write,exec stuff/* # CHECK: stuff/all # CHECK: stuff/writeexec -path filter --perm read,write,exec stuff/* | path sort +path filter --perm read,write,exec stuff/* # CHECK: stuff/all -path filter stuff/* | path sort +path filter stuff/* # CHECK: stuff/all # CHECK: stuff/exec # CHECK: stuff/none