tests.testers.shellcheck: switch to testBuildFailure'

2025-03-03 16:10:29 +00:00
parent 3de1aeac1f
commit ea7ec7044b
1 changed files with 25 additions and 33 deletions
@@ -4,41 +4,33 @@
 {
  lib,
  testers,
-  runCommand,
 }:
 lib.recurseIntoAttrs {
-
-  example-dir =
-    runCommand "test-testers-shellcheck-example-dir"
-      {
-        failure = testers.testBuildFailure (
-          testers.shellcheck {
-            name = "shellcheck-example-dir";
-            src = ./src;
-          }
-        );
-      }
+  example-dir = testers.testBuildFailure' {
+    drv = testers.shellcheck {
+      name = "example-dir";
+      src = ./src;
+    };
+    expectedBuilderExitCode = 123;
+    expectedBuilderLogEntries = [
      ''
-        log="$failure/testBuildFailure.log"
-        echo "Checking $log"
-        grep SC2068 "$log"
-        touch $out
-      '';
-
-  example-file =
-    runCommand "test-testers-shellcheck-example-file"
-      {
-        failure = testers.testBuildFailure (
-          testers.shellcheck {
-            name = "shellcheck-example-file";
-            src = ./src/example.sh;
-          }
-        );
-      }
+        echo $@
+             ^-- SC2068 (error): Double quote array expansions to avoid re-splitting elements.
      ''
-        log="$failure/testBuildFailure.log"
-        echo "Checking $log"
-        grep SC2068 "$log"
-        touch $out
-      '';
+    ];
+  };
+
+  example-file = testers.testBuildFailure' {
+    drv = testers.shellcheck {
+      name = "example-file";
+      src = ./src/example.sh;
+    };
+    expectedBuilderExitCode = 123;
+    expectedBuilderLogEntries = [
+      ''
+        echo $@
+             ^-- SC2068 (error): Double quote array expansions to avoid re-splitting elements.
+      ''
+    ];
+  };
 }