about summary refs log tree commit diff
path: root/pkgs/by-name
diff options
context:
space:
mode:
authorRobert Hensing <robert@roberthensing.nl>2023-11-19 12:24:10 +0100
committerRobert Hensing <robert@roberthensing.nl>2023-11-19 12:44:44 +0100
commit3ce9db808b5bf6cf7e7c9c64d20c17620916c7e7 (patch)
tree17b1ac00de78be8634d97baa372582294ebeefe9 /pkgs/by-name
parent9009c53c9719a509920824e480731431bb3b4622 (diff)
changelog-d: Move out tests.basic
Diffstat (limited to 'pkgs/by-name')
-rw-r--r--pkgs/by-name/ch/changelog-d/package.nix26
-rw-r--r--pkgs/by-name/ch/changelog-d/tests/basic.nix25
2 files changed, 27 insertions, 24 deletions
diff --git a/pkgs/by-name/ch/changelog-d/package.nix b/pkgs/by-name/ch/changelog-d/package.nix
index f390596b59476..c855beca0fe25 100644
--- a/pkgs/by-name/ch/changelog-d/package.nix
+++ b/pkgs/by-name/ch/changelog-d/package.nix
@@ -1,9 +1,9 @@
 {
   cabal2nix,
+  callPackage,
   lib,
   haskell,
   haskellPackages,
-  runCommand,
   writeShellApplication,
 }:
 
@@ -27,29 +27,7 @@ let
       '';
     });
     passthru.tests = {
-      basic = runCommand "changelog-d-basic-test" {
-          nativeBuildInputs = [ finalAttrs.finalPackage ];
-        } ''
-          mkdir changelogs
-          cat > changelogs/config <<EOF
-          organization: NixOS
-          repository: boondoggle
-          EOF
-          cat > changelogs/a <<EOF
-          synopsis: Support numbers with incrementing base-10 digits
-          issues: #1234
-          description: {
-          This didn't work before.
-          }
-          EOF
-          changelog-d changelogs >$out
-          cat -n $out
-          echo Checking the generated output
-          set -x
-          grep -F 'Support numbers with incrementing base-10 digits' $out >/dev/null
-          grep -F 'https://github.com/NixOS/boondoggle/issues/1234' $out >/dev/null
-          set +x
-        '';
+      basic = callPackage ./tests/basic.nix { changelog-d = finalAttrs.finalPackage; };
     };
 
     meta = oldAttrs.meta // {
diff --git a/pkgs/by-name/ch/changelog-d/tests/basic.nix b/pkgs/by-name/ch/changelog-d/tests/basic.nix
new file mode 100644
index 0000000000000..25d434f0729fc
--- /dev/null
+++ b/pkgs/by-name/ch/changelog-d/tests/basic.nix
@@ -0,0 +1,25 @@
+{ runCommand, changelog-d }:
+
+runCommand "changelog-d-basic-test" {
+  nativeBuildInputs = [ changelog-d ];
+} ''
+  mkdir changelogs
+  cat > changelogs/config <<EOF
+  organization: NixOS
+  repository: boondoggle
+  EOF
+  cat > changelogs/a <<EOF
+  synopsis: Support numbers with incrementing base-10 digits
+  issues: #1234
+  description: {
+  This didn't work before.
+  }
+  EOF
+  changelog-d changelogs >$out
+  cat -n $out
+  echo Checking the generated output
+  set -x
+  grep -F 'Support numbers with incrementing base-10 digits' $out >/dev/null
+  grep -F 'https://github.com/NixOS/boondoggle/issues/1234' $out >/dev/null
+  set +x
+''