test(cryptsetup): update the skip condition

akinomyoga · May 13, 2024 · 1c5be70 · 1c5be70
1 parent 830a868
commit 1c5be70
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/completions/cryptsetup b/completions/cryptsetup
@@ -13,7 +13,7 @@ _comp_cmd_cryptsetup__device()
 _comp_cmd_cryptsetup__action()
 {
     local REPLY IFS=$' \t\n'
-    _comp_dequote "$1" || return 1
+    _comp_dequote "${1-}" || return 1
     local cmd=${REPLY:-cryptsetup}
     local -a actions
     _comp_split -l actions "$(
@@ -46,7 +46,7 @@ _comp_cmd_cryptsetup__action()
             filtering_pattern=${filtering_pattern%$'\n'}
 
             local filtered_actions
-            filtered_actions=$(strings "$path" | grep -Fx "$filtering_pattern" | sort -u) &&
+            filtered_actions=$(strings "$path" | command grep -Fx "$filtering_pattern" | sort -u) &&
                 [[ $filtered_actions ]] &&
                 _comp_split -l actions "$filtered_actions"
         fi

diff --git a/test/t/test_cryptsetup.py b/test/t/test_cryptsetup.py
@@ -13,7 +13,7 @@ def test_2(self, completion):
     @pytest.mark.complete(
         "cryptsetup luksE",
         require_cmd=True,
-        skipif='! strings "$(type -P cryptsetup)" | grep -qFx luksErase',
+        skipif=r'! { cryptsetup --help; man cryptsetup; } 2>/dev/null | command grep -qE "(^|[[:space:]])luksErase([[:space:]]|\$)"',
     )
     def test_github_issue758(self, completion):
         assert completion == "rase"