Update certain integration tests

Author: mpilgrem

test/integration/tests/1265-extensible-snapshots/Main.hs

@@ -6,5 +6,5 @@ main = do
     stackErr ["build", "zlib-bindings"]
     stack ["build", "--stack-yaml", "stack-modify-lts.yaml", "async"]
     stack ["build", "--stack-yaml", "stack-local-snapshot.yaml", "async"]
-    stack ["build", "--stack-yaml", "stack-remote-snapshot.yaml", "async"]
+    stack ["build", "--stack-yaml", "stack-remote-snapshot.yaml", "acme-missiles"]
     stackErr ["build", "--stack-yaml", "stack-modify-lts.yaml", "zlib-bindings"]

test/integration/tests/1265-extensible-snapshots/files/snapshot-2.yaml

@@ -1,9 +1,10 @@
 resolver: ghc-9.4.5
 name: test-snapshot-2
 packages:
-- stm-2.5.0.0
-- async-2.1.0
-- zlib-0.6.2.1@sha256:201b3f7d4edd0a6a0b235105a4d1aa8d30dcb7c8b4043102487407a4753657ef,4508
+- stm-2.5.1.0
+- async-2.2.4
+- hashable-1.4.2.0
+- zlib-0.6.3.0@sha256:9adce39e4ca0b7a87d45df0a243134816c57059a08e28cff5469c98ae1f54dfc,5367
 # FIXME: test these here
 flags: {}
 ghc-options: {}

test/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml

@@ -2,4 +2,4 @@
 resolver: lts-21.0
 name: remote-snapshot
 packages:
-- archive: https://s3.amazonaws.com/hackage.fpcomplete.com/package/ghc-prim-0.8.0.tar.gz
+- archive: https://s3.amazonaws.com/hackage.fpcomplete.com/package/acme-missiles-0.3.tar.gz

test/integration/tests/3926-ghci-with-sublibraries/files/files.cabal

@@ -1,7 +1,8 @@
+cabal-version: 2.0
+
 name:           files
 version:        0.1.0.0
 build-type:     Simple
-cabal-version:  >= 2.0
 
 library
   hs-source-dirs:   src

test/integration/tests/3926-ghci-with-sublibraries/files/stack.yaml

@@ -1,4 +1,4 @@
 resolver: ghc-9.4.5
 extra-deps:
-- stm-2.4.4.1
-- mtl-2.2.1
+- stm-2.5.1.0
+- mtl-2.2.2

test/integration/tests/3942-solver-error-output/files/test-stack.yml

@@ -1,4 +1,4 @@
-resolver: lts-20.23
+resolver: nightly-2023-06-18
 
 packages: []
 

test/integration/tests/4101-dependency-tree/Main.hs

@@ -12,34 +12,34 @@ main =
   stackCheckStdout ["ls", "dependencies", "tree"] $ \stdOut -> do
     let expected = unlines [ "Packages"
                            , "├─┬ files 0.1.0.0"
-                           , "│ ├─┬ base 4.16.4.0"
+                           , "│ ├─┬ base 4.17.1.0"
                            ]
     unless (expected `isPrefixOf` stdOut) $
       error $ unlines [ "Expected:", expected, "Actual:", stdOut ]
 
   stackCheckStdout ["ls", "dependencies", "tree", "--depth=1"] $ \stdOut -> do
     let expected = unlines [ "Packages"
                            , "├─┬ files 0.1.0.0"
-                           , "│ ├── base 4.16.4.0"
+                           , "│ ├── base 4.17.1.0"
                            , "│ ├── filelock 0.1.1.2"
                            , "│ ├── mtl 2.2.2"
                            , "│ └── subproject 0.1.0.0"
                            , "└─┬ subproject 0.1.0.0"
-                           , "  └── base 4.16.4.0"
+                           , "  └── base 4.17.1.0"
                            ]
     when (stdOut /= expected) $
       error $ unlines [ "Expected:", expected, "Actual:", stdOut ]
 
   stackCheckStdout ["ls", "dependencies", "tree", "subproject"] $ \stdOut -> do
     let expected = unlines [ "Packages"
                            , "└─┬ subproject 0.1.0.0"
-                           , "  └─┬ base 4.16.4.0"
-                           ,"    ├─┬ ghc-bignum 1.2"
-                           ,"    │ └─┬ ghc-prim 0.8.0"
-                           ,"    │   └── rts 1.0.2"
-                           ,"    ├─┬ ghc-prim 0.8.0"
-                           ,"    │ └── rts 1.0.2"
-                           ,"    └── rts 1.0.2"
+                           , "  └─┬ base 4.17.1.0"
+                           , "    ├─┬ ghc-bignum 1.3"
+                           , "    │ └─┬ ghc-prim 0.9.0"
+                           , "    │   └── rts 1.0.2"
+                           , "    ├─┬ ghc-prim 0.9.0"
+                           , "    │ └── rts 1.0.2"
+                           , "    └── rts 1.0.2"
                            ]
     when (stdOut /= expected) $
       error $ unlines [ "Expected:", expected, "Actual:", stdOut ]

test/integration/tests/cabal-non-buildable-bug/Main.hs

@@ -14,5 +14,7 @@ main = do
   -- and build will fail (because Cabal will be using its broken
   -- logic).
   writeFile "stack.yaml" "resolver: ghc-7.10.3"
-  stackErr ["build"]
-  stackErr ["build", "--dry-run"]
+  -- The '--install-ghc' flag is passed here, because IntegrationSpec.runApp
+  -- sets up `config.yaml` with `system-ghc: true` and `install-ghc: false`.
+  stackErr ["--install-ghc", "build"]
+  stackErr ["--install-ghc", "build", "--dry-run"]

test/integration/tests/cabal-sublibrary-dependency/Main.hs

@@ -7,10 +7,10 @@ import StackTest
 -- sub, each of which exposes a module that exports a function.
 
 main :: IO ()
--- The '--install-ghc' flag is passed here, because etc/scripts/release.hs
--- passes `--no-install-ghc` when `--alpine` is passed to its 'check' command.
--- (See stack.yaml; using GHC 9.4.4.)
-main = stackErrStderr ["build", "--install-ghc"] $ \str ->
+-- The '--install-ghc' flag is passed here, because IntegrationSpec.runApp sets
+-- up `config.yaml` with `system-ghc: true` and `install-ghc: false`.
+-- (See stack.yaml; using GHC 9.4.5.)
+main = stackErrStderr ["--install-ghc", "build"] $ \str ->
   let msg = "Sublibrary dependency is not supported, this will almost \
             \certainly fail."
   in  unless (msg `isInfixOf` str) $

test/integration/tests/cyclic-test-deps/Main.hs

@@ -2,9 +2,9 @@ import StackTest
 
 main :: IO ()
 main = do
-    removeDirIgnore "text-2.0"
-    stack ["unpack", "text-2.0"]
-    stack ["unpack", "QuickCheck-2.14.2"]
+    removeDirIgnore "text-2.0.2"
+    stack ["unpack", "text-2.0.2"]
+    stack ["unpack", "QuickCheck-2.14.3"]
     removeFileIgnore "stack.yaml"
     stack ["init", defaultResolverArg]
     stack ["test", "--dry-run"]