silence flake update and gen-cabal in tests

tek · Oct 8, 2023 · 78c3cb8 · 78c3cb8
1 parent fe4db9a
commit 78c3cb8
Show file tree

Hide file tree

Showing 19 changed files with 28 additions and 23 deletions.
diff --git a/lib/with-config.nix b/lib/with-config.nix
@@ -108,7 +108,7 @@ let
     ${pkgs.git}/bin/git init
   fi
   ${pkgs.git}/bin/git add .
-  ${nixC} flake update
+  ${nixC} flake update --quiet --quiet
   ${pkgs.git}/bin/git add flake.lock
   ${post}
   '';
@@ -123,7 +123,7 @@ let
     ${pkgs.git}/bin/git init
   fi
   ${pkgs.git}/bin/git add .
-  ${nixC} flake update
+  ${nixC} flake update --quiet --quiet
   ${pkgs.git}/bin/git add flake.lock
   ${post}
   '';

diff --git a/test/basic/test.nix b/test/basic/test.nix
@@ -2,7 +2,7 @@
 {
   test = builtins.toFile "basic-test" ''
     cd ./root
-    nix flake update
+    flake_update
 
     target='[ "ghc90-root" "ghc92-root" "ghc94-root" "ghc96-root" "root" ]'
     check 'nix eval .#checks.x86_64-linux --apply builtins.attrNames' $target 'Checks are wrong'

diff --git a/test/cross/test.nix b/test/cross/test.nix
@@ -2,7 +2,7 @@
 {
   test = builtins.toFile "cross-test" ''
     cd ./root
-    nix flake update --quiet --quiet
+    flake_update
 
     check_musl()
     {

diff --git a/test/default.nix b/test/default.nix
@@ -127,6 +127,11 @@ in {
     check_match "nix run $1 <<< ':quit'" $2 $3
   }
 
+  flake_update()
+  {
+    nix flake update --quiet --quiet
+  }
+
   runtest()
   {
     setopt local_options err_return

diff --git a/test/dep-versions/test.nix b/test/dep-versions/test.nix
@@ -1,7 +1,7 @@
 {...}: {
   test = builtins.toFile "dep-versions-test" ''
     cd ./root
-    nix flake update
+    flake_update
 
     target='
 [34mdep[0m

diff --git a/test/deps/test.nix b/test/deps/test.nix
@@ -2,7 +2,7 @@
 {
   test = builtins.toFile "deps-test" ''
     cd ./root
-    nix flake update
+    flake_update
 
     check_match 'nix run .#show-overrides -- dev' 'Hackage: 1.0.0' 'show-overrides does not contain "Hackage: 1.0.0"'
 

diff --git a/test/env/test.nix b/test/env/test.nix
@@ -2,7 +2,7 @@
 {
   test = builtins.toFile "env-test" ''
     cd ./root
-    nix flake update --quiet --quiet
+    flake_update
 
     # TODO this can be 1 when a solution for component env fallback is implemented
     check 'nix run .#cmd.number' 2 'Wrong output for plain command with component'

diff --git a/test/ghci-vm/test.nix b/test/ghci-vm/test.nix
@@ -2,8 +2,8 @@
 {
   test = builtins.toFile "ghci-vm-test" ''
     cd ./root
-    nix flake update
-    nix run .#gen-cabal
+    flake_update
+    nix run .#gen-cabal-quiet
 
     ghci_match '.#ghci -- -p root -t main' 'test-endpoint' "ghci service output with component env does not contain 'test-endpoint'"
 

diff --git a/test/ghci/test.nix b/test/ghci/test.nix
@@ -2,8 +2,8 @@
 {
   test = builtins.toFile "ghci-test" ''
     cd ./root
-    nix flake update
-    nix run .#gen-cabal
+    flake_update
+    nix run .#gen-cabal-quiet
 
     ghci_match ".#ghci -- --root $PWD -c lib -m Root.Lib -r cwd" "$PWD/pkg/" 'ghci cwd with cd printed wrong directory'
 

diff --git a/test/hackage/test.nix b/test/hackage/test.nix
@@ -3,7 +3,7 @@ let
 
   regular = ''
     cd ./root
-    nix flake update
+    flake_update
     git init --quiet
     git add .
     git commit -m "init" --quiet
@@ -114,7 +114,7 @@ let
 
   synthetic = ''
     cd ./nix-hpack
-    nix flake update
+    flake_update
     nix run .#hpack-quiet
     git init --quiet
     git add .

diff --git a/test/local-prelude/test.nix b/test/local-prelude/test.nix
@@ -2,7 +2,7 @@
 {
   test = builtins.toFile "local-prelude-test" ''
     cd ./root
-    nix flake update
+    flake_update
 
     ghci_match ".#ghci -- -p root -t main" "success" 'local-prelude broken'
   '';

diff --git a/test/new-static-github/test.nix b/test/new-static-github/test.nix
@@ -4,7 +4,7 @@
     mkdir root
     cd ./root
     nix run "github:tek/hix#new" -- --name 'red-panda'
-    nix run .#gen-cabal
+    nix run .#gen-cabal-quiet
     check_match 'nix run .#ghci -- -p red-panda -t main <<< :quit' 'passed 1 test' 'Running tests in generated project failed'
     check_match 'nix run' 'Hello red-panda' 'App in generated project failed'
   '';

diff --git a/test/new-static/test.nix b/test/new-static/test.nix
@@ -4,7 +4,7 @@
     mkdir root
     cd ./root
     nix run "path:$hix_dir#new" -- --name 'red-panda' --author='Red Panda'
-    nix run .#gen-cabal
+    nix run .#gen-cabal-quiet
     check_match 'nix run .#ghci -- -p red-panda -t main <<< :quit' 'passed 1 test' 'Running tests in generated project failed'
     check_match 'nix run' 'Hello red-panda' 'App in generated project failed'
   '';

diff --git a/test/new/test.nix b/test/new/test.nix
@@ -4,7 +4,7 @@
     mkdir root
     cd ./root
     nix run path:$hix_dir#cli -- new --hix-url="path:$hix_dir" --name 'red-panda' --author 'Panda'
-    nix run .#gen-cabal
+    nix run .#gen-cabal-quiet
     check_match 'nix run .#ghci -- -p red-panda -t main <<< :quit' 'passed 1 test' 'Running tests in generated project failed'
     check_match 'nix run' 'Hello red-panda' 'App in generated project failed'
   '';

diff --git a/test/overrides/test.nix b/test/overrides/test.nix
@@ -43,7 +43,7 @@ in {
     cd ./dep
     nix run .#gen-overrides
     cd ../root
-    nix flake update
+    flake_update
 
     check_eq '${finalSingle.version}' '2.1.2.1' 'Wrong version for aeson (single)'
     check_eq '${finalMulti.version}' '2.1.2.1' 'Wrong version for aeson (multi)'

diff --git a/test/packages/test.nix b/test/packages/test.nix
@@ -136,7 +136,7 @@ let
 in {
   test = builtins.toFile "packages-test" ''
     cd ./root
-    nix flake update
+    flake_update
     nix run .#gen-cabal-quiet
 
     if ! diff ${targetDep} dep/dep-lib.cabal

diff --git a/test/postgres/test.nix b/test/postgres/test.nix
@@ -2,7 +2,7 @@
 {
   test = builtins.toFile "postgres-test" ''
     cd ./root
-    nix flake update
+    flake_update
     output=$(nix run .#cmd.db-test | tail -n5)
 
     target=' ?column? 

diff --git a/test/service/test.nix b/test/service/test.nix
@@ -2,7 +2,7 @@
 {
   test = builtins.toFile "service-test" ''
     cd ./root
-    nix flake update
+    flake_update
     check_match 'nix run .#cmd.test' 'received' 'invalid output of service command'
   '';
 }
diff --git a/test/subdir/test.nix b/test/subdir/test.nix
@@ -5,8 +5,8 @@
     git init --quiet
     git add .
     cd sub
-    nix flake update
+    flake_update
 
-    nix run .#gen-cabal
+    nix run .#gen-cabal-quiet
   '';
 }