Remove test/*/setup-config before spec

test/CabalApiSpec.hs

@@ -19,12 +19,6 @@ import Config (cProjectVersionInt) -- ghc version
 ghcVersion :: Int
 ghcVersion = read cProjectVersionInt
 
-unconfigure :: IO ()
-unconfigure = do
-  removeFile cabalConfigPath `catch` (\(_ :: SomeException) ->  return ())
-
-around' a f = a >> f >> a
-
 spec :: Spec
 spec = do
     describe "parseCabalFile" $ do
@@ -69,8 +63,7 @@ spec = do
 
     describe "cabalGetConfig" $ do
         it "can reconfigure a cabal package" $ do
-            withDirectory_ "test/data/check-test-subdir"
+            withDirectory_ "test/data/check-test-subdir" $ do
-              $ around' unconfigure $ do
                 cradle <- findCradle
                 cfg <- cabalGetConfig cradle
                 cfg `shouldSatisfy` not . null

test/Main.hs

@@ -16,4 +16,5 @@ main = do
       genGhcPkgCache dir = system $ "ghc-pkg recache --force -f" ++ dir
   genSandboxCfg `mapM_` sandboxes
   genGhcPkgCache `mapM_` pkgDirs
+  system "find test -name setup-config -exec rm {} \\;"
   hspec spec