Merge pull request haskell#10045 from bacchanalia/zz/fix-flaky-tests-…

…3.12 [3.12] PackageTests/NewUpdate: fix skipping flaky tests
ulysses4ever · Jun 3, 2024 · 386fa23 · 386fa23
2 parents b935691 + 643cd64
commit 386fa23
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/cabal-testsuite/PackageTests/CustomTestCoverage/cabal.out b/cabal-testsuite/PackageTests/CustomTestCoverage/cabal.out
@@ -4,14 +4,14 @@ Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - plain-0.1.0.0 *test (first run)
 Configuring plain-0.1.0.0...
-Preprocessing library for plain-0.1.0.0..
-Building library for plain-0.1.0.0..
-Preprocessing test suite 'test' for plain-0.1.0.0..
-Building test suite 'test' for plain-0.1.0.0..
+Preprocessing library for plain-0.1.0.0...
+Building library for plain-0.1.0.0...
+Preprocessing test suite 'test' for plain-0.1.0.0...
+Building test suite 'test' for plain-0.1.0.0...
 Running 1 test suites...
 Test suite test: RUNNING...
 Test suite test: PASS
 Test suite logged to: <ROOT>/cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/plain-0.1.0.0/test/plain-0.1.0.0-test.log
-Test coverage report written to <ROOT>/cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/plain-0.1.0.0/hpc/vanilla/html/test/hpc_index.html
+Package coverage report written to <ROOT>/cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/plain-0.1.0.0/hpc/vanilla/html/hpc_index.html
 1 of 1 test suites (1 of 1 test cases) passed.
-Package coverage report written to <ROOT>/cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/plain-0.1.0.0/hpc/vanilla/html/plain-0.1.0.0/hpc_index.html
+Package coverage report written to <ROOT>/cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/plain-0.1.0.0/hpc/vanilla/html/hpc_index.html
diff --git a/cabal-testsuite/PackageTests/NewUpdate/RejectFutureIndexStates/cabal.test.hs b/cabal-testsuite/PackageTests/NewUpdate/RejectFutureIndexStates/cabal.test.hs
@@ -1,10 +1,14 @@
 import Test.Cabal.Prelude
 import Data.List (isPrefixOf)
 
-main = cabalTest $ withProjectFile "cabal.project" $ withRemoteRepo "repo" $ do
+main = cabalTest $ do
 
   skip "Flaky test failing in `curl`, see #9530"
 
+  testBody
+
+testBody = withProjectFile "cabal.project" $ withRemoteRepo "repo" $ do
+
   output <- last
           . words
           . head

diff --git a/cabal-testsuite/PackageTests/NewUpdate/UpdateIndexState/update-index-state.test.hs b/cabal-testsuite/PackageTests/NewUpdate/UpdateIndexState/update-index-state.test.hs
@@ -1,9 +1,13 @@
 import Test.Cabal.Prelude
 
-main = cabalTest $ withRemoteRepo "repo" $ do
+main = cabalTest $ do
 
   skip "Flaky test failing in `curl`, see #9530"
 
+  testBody
+
+testBody = withRemoteRepo "repo" $ do
+
   -- The _first_ update call causes a warning about missing mirrors, the warning
   -- is platform-dependent and it's not part of the test expectations, so we
   -- check the output manually.

diff --git a/cabal-testsuite/PackageTests/Regression/T9640/cabal.out b/cabal-testsuite/PackageTests/Regression/T9640/cabal.out
@@ -7,8 +7,8 @@ In order, the following will be built:
  - one-custom-0.1.0.0 (lib:one-custom) (requires build)
  - depend-on-custom-with-exe-0.1.0.0 (lib) (first run)
 Configuring one-custom-0.1.0.0...
-Preprocessing library for one-custom-0.1.0.0..
-Building library for one-custom-0.1.0.0..
+Preprocessing library for one-custom-0.1.0.0...
+Building library for one-custom-0.1.0.0...
 Installing library in <PATH>
 Warning: depend-on-custom-with-exe.cabal:16:1: Ignoring trailing fields after sections: "ghc-options"
 Configuring library for depend-on-custom-with-exe-0.1.0.0...