Enable the PubGrub resolver in tests by default

Author: hartbit

Sources/SPMTestSupport/TestWorkspace.swift

@@ -38,7 +38,7 @@ public final class TestWorkspace {
         packages: [TestPackage],
         toolsVersion: ToolsVersion = ToolsVersion.currentToolsVersion,
         skipUpdate: Bool = false,
-        enablePubGrub: Bool = false
+        enablePubGrub: Bool = true
     ) throws {
         self.sandbox = sandbox
         self.fs = fs

Tests/WorkspaceTests/WorkspaceTests.swift

@@ -21,7 +21,6 @@ import TSCUtility
 import SPMTestSupport
 
 final class WorkspaceTests: XCTestCase {
-
     func testBasics() throws {
         let sandbox = AbsolutePath("/tmp/ws/")
         let fs = InMemoryFileSystem()
@@ -743,7 +742,7 @@ final class WorkspaceTests: XCTestCase {
         ]
         workspace.checkPackageGraph(deps: deps) { (_, diagnostics) in
             DiagnosticsEngineTester(diagnostics) { result in
-                result.check(diagnostic: .contains("the package dependency graph could not be resolved; possibly because of these requirements"), behavior: .error)
+                result.check(diagnostic: .contains("version solving failed"), behavior: .error)
             }
         }
         // There should be no extra fetches.
@@ -1412,7 +1411,7 @@ final class WorkspaceTests: XCTestCase {
         // Check failure.
         workspace.checkResolve(pkg: "Foo", roots: ["Root"], version: "1.3.0") { diagnostics in
             DiagnosticsEngineTester(diagnostics) { result in
-                result.check(diagnostic: .contains("tmp/ws/pkgs/Foo @ 1.3.0"), behavior: .error)
+                result.check(diagnostic: .contains("Foo 1.3.0"), behavior: .error)
             }
         }
         workspace.checkManagedDependencies() { result in
@@ -1505,7 +1504,7 @@ final class WorkspaceTests: XCTestCase {
 
         workspace.checkPackageGraph(roots: ["Root"]) { (graph, diagnostics) in
             DiagnosticsEngineTester(diagnostics) { result in
-                result.check(diagnostic: .contains("/tmp/ws/pkgs/Foo @ 1.0.0..<2.0.0"), behavior: .error)
+                result.check(diagnostic: .contains("Foo 1.0.0..<2.0.0"), behavior: .error)
             }
         }
     }
@@ -2070,7 +2069,7 @@ final class WorkspaceTests: XCTestCase {
         ]
         workspace.checkPackageGraph(roots: ["Root"], deps: deps) { (_, diagnostics) in
             DiagnosticsEngineTester(diagnostics) { result in
-                result.check(diagnostic: .contains("/tmp/ws/pkgs/Bar @ 1.1.0"), behavior: .error)
+                result.check(diagnostic: .contains("Bar 1.1.0"), behavior: .error)
             }
         }
     }
@@ -2256,7 +2255,7 @@ final class WorkspaceTests: XCTestCase {
                 result.check(targets: "Foo")
             }
             DiagnosticsEngineTester(diagnostics) { result in
-                result.check(diagnostic: .contains("1.5.0 contains incompatible dependencies"), behavior: .error)
+                result.check(diagnostic: .contains("Bar {1.0.0..<1.5.0, 1.5.1..<2.0.0} is forbidden"), behavior: .error)
             }
         }
     }
@@ -3300,8 +3299,7 @@ final class WorkspaceTests: XCTestCase {
                     ],
                     versions: ["1.0.0", nil]
                 ),
-            ],
-            enablePubGrub: true
+            ]
         )
 
         // Load the graph.