make tests that cehck stderr more robust (#3951)

tomerd · tomerd · commit 63abfbb740cd · 2021-12-16T19:25:10.000-08:00
diff --git a/Tests/CommandsTests/BuildToolTests.swift b/Tests/CommandsTests/BuildToolTests.swift
@@ -135,42 +135,42 @@ final class BuildToolTests: CommandsTestCase {
                 _ = try execute(["--product", "exec1", "--target", "exec2"], packagePath: path)
                 XCTFail("Expected to fail")
             } catch SwiftPMProductError.executionFailure(_, _, let stderr) {
-                XCTAssertEqual(stderr, "error: '--product' and '--target' are mutually exclusive\n")
+                XCTAssertMatch(stderr, .contains("error: '--product' and '--target' are mutually exclusive"))
             }
 
             do {
                 _ = try execute(["--product", "exec1", "--build-tests"], packagePath: path)
                 XCTFail("Expected to fail")
             } catch SwiftPMProductError.executionFailure(_, _, let stderr) {
-                XCTAssertEqual(stderr, "error: '--product' and '--build-tests' are mutually exclusive\n")
+                XCTAssertMatch(stderr, .contains("error: '--product' and '--build-tests' are mutually exclusive"))
             }
 
             do {
                 _ = try execute(["--build-tests", "--target", "exec2"], packagePath: path)
                 XCTFail("Expected to fail")
             } catch SwiftPMProductError.executionFailure(_, _, let stderr) {
-                XCTAssertEqual(stderr, "error: '--target' and '--build-tests' are mutually exclusive\n")
+                XCTAssertMatch(stderr, .contains("error: '--target' and '--build-tests' are mutually exclusive"))
             }
 
             do {
                 _ = try execute(["--build-tests", "--target", "exec2", "--product", "exec1"], packagePath: path)
                 XCTFail("Expected to fail")
             } catch SwiftPMProductError.executionFailure(_, _, let stderr) {
-                XCTAssertEqual(stderr, "error: '--product', '--target', and '--build-tests' are mutually exclusive\n")
+                XCTAssertMatch(stderr, .contains("error: '--product', '--target', and '--build-tests' are mutually exclusive"))
             }
 
             do {
                 _ = try execute(["--product", "UnkownProduct"], packagePath: path)
                 XCTFail("Expected to fail")
             } catch SwiftPMProductError.executionFailure(_, _, let stderr) {
-                XCTAssertEqual(stderr, "error: no product named 'UnkownProduct'\n")
+                XCTAssertMatch(stderr, .contains("error: no product named 'UnkownProduct'"))
             }
 
             do {
                 _ = try execute(["--target", "UnkownTarget"], packagePath: path)
                 XCTFail("Expected to fail")
             } catch SwiftPMProductError.executionFailure(_, _, let stderr) {
-                XCTAssertEqual(stderr, "error: no target named 'UnkownTarget'\n")
+                XCTAssertMatch(stderr, .contains("error: no target named 'UnkownTarget'"))
             }
         }
     }
diff --git a/Tests/CommandsTests/PackageToolTests.swift b/Tests/CommandsTests/PackageToolTests.swift
@@ -852,7 +852,7 @@ final class PackageToolTests: CommandsTestCase {
                     try execute("resolve", "bar")
                     XCTFail("This should have been an error")
                 } catch SwiftPMProductError.executionFailure(_, _, let stderr) {
-                    XCTAssertMatch(stderr, .prefix("error: edited dependency 'bar' can't be resolved"))
+                    XCTAssertMatch(stderr, .contains("error: edited dependency 'bar' can't be resolved"))
                 }
                 try execute("unedit", "bar")
             }
@@ -979,7 +979,7 @@ final class PackageToolTests: CommandsTestCase {
                     try block()
                     XCTFail()
                 } catch SwiftPMProductError.executionFailure(_, _, let stderrOutput) {
-                    XCTAssertEqual(stderrOutput, stderr)
+                    XCTAssertMatch(stderrOutput, .contains(stderr))
                 } catch {
                     XCTFail("unexpected error: \(error)")
                 }
diff --git a/Tests/CommandsTests/RunToolTests.swift b/Tests/CommandsTests/RunToolTests.swift
@@ -57,7 +57,7 @@ final class RunToolTests: CommandsTestCase {
                 _ = try execute(["unknown"], packagePath: path)
                 XCTFail("Unexpected success")
             } catch SwiftPMProductError.executionFailure(_, _, let stderr) {
-                XCTAssertEqual(stderr, "error: no executable product named 'unknown'\n")
+                XCTAssertMatch(stderr, .contains("error: no executable product named 'unknown'"))
             }
         }
     }
@@ -68,7 +68,7 @@ final class RunToolTests: CommandsTestCase {
                 _ = try execute([], packagePath: path)
                 XCTFail("Unexpected success")
             } catch SwiftPMProductError.executionFailure(_, _, let stderr) {
-                XCTAssertEqual(stderr, "error: multiple executable products available: exec1, exec2\n")
+                XCTAssertMatch(stderr, .contains("error: multiple executable products available: exec1, exec2"))
             }
             
             var (runOutput, _) = try execute(["exec1"], packagePath: path)
@@ -103,7 +103,7 @@ final class RunToolTests: CommandsTestCase {
                 _ = try execute(["--build-tests", "--skip-build"], packagePath: path)
                 XCTFail("Expected to fail")
             } catch SwiftPMProductError.executionFailure(_, _, let stderr) {
-                XCTAssertEqual(stderr, "error: '--build-tests' and '--skip-build' are mutually exclusive\n")
+                XCTAssertMatch(stderr, .contains("error: '--build-tests' and '--skip-build' are mutually exclusive"))
             }
         }
     }
diff --git a/Tests/CommandsTests/TestToolTests.swift b/Tests/CommandsTests/TestToolTests.swift
@@ -41,7 +41,7 @@ final class TestToolTests: CommandsTestCase {
             do {
                 _ = try execute(["--num-workers", "1"])
             } catch SwiftPMProductError.executionFailure(_, _, let stderr) {
-                XCTAssertEqual(stderr, "error: --num-workers must be used with --parallel\n")
+                XCTAssertMatch(stderr, .contains("error: --num-workers must be used with --parallel"))
             }
         }
         #endif
@@ -53,7 +53,7 @@ final class TestToolTests: CommandsTestCase {
             do {
                 _ = try execute(["--parallel", "--num-workers", "0"])
             } catch SwiftPMProductError.executionFailure(_, _, let stderr) {
-                XCTAssertEqual(stderr, "error: '--num-workers' must be greater than zero\n")
+                XCTAssertMatch(stderr, .contains("error: '--num-workers' must be greater than zero"))
             }
         }
         #endif

Original file line number	Diff line number	Diff line change
`@@ -135,42 +135,42 @@ final class BuildToolTests: CommandsTestCase {`
`135`	`135`	`_ = try execute(["--product", "exec1", "--target", "exec2"], packagePath: path)`
`136`	`136`	`XCTFail("Expected to fail")`
`137`	`137`	`} catch SwiftPMProductError.executionFailure(_, _, let stderr) {`
`138`		`- XCTAssertEqual(stderr, "error: '--product' and '--target' are mutually exclusive\n")`
	`138`	`+ XCTAssertMatch(stderr, .contains("error: '--product' and '--target' are mutually exclusive"))`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`do {`
`142`	`142`	`_ = try execute(["--product", "exec1", "--build-tests"], packagePath: path)`
`143`	`143`	`XCTFail("Expected to fail")`
`144`	`144`	`} catch SwiftPMProductError.executionFailure(_, _, let stderr) {`
`145`		`- XCTAssertEqual(stderr, "error: '--product' and '--build-tests' are mutually exclusive\n")`
	`145`	`+ XCTAssertMatch(stderr, .contains("error: '--product' and '--build-tests' are mutually exclusive"))`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`do {`
`149`	`149`	`_ = try execute(["--build-tests", "--target", "exec2"], packagePath: path)`
`150`	`150`	`XCTFail("Expected to fail")`
`151`	`151`	`} catch SwiftPMProductError.executionFailure(_, _, let stderr) {`
`152`		`- XCTAssertEqual(stderr, "error: '--target' and '--build-tests' are mutually exclusive\n")`
	`152`	`+ XCTAssertMatch(stderr, .contains("error: '--target' and '--build-tests' are mutually exclusive"))`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`do {`
`156`	`156`	`_ = try execute(["--build-tests", "--target", "exec2", "--product", "exec1"], packagePath: path)`
`157`	`157`	`XCTFail("Expected to fail")`
`158`	`158`	`} catch SwiftPMProductError.executionFailure(_, _, let stderr) {`
`159`		`- XCTAssertEqual(stderr, "error: '--product', '--target', and '--build-tests' are mutually exclusive\n")`
	`159`	`+ XCTAssertMatch(stderr, .contains("error: '--product', '--target', and '--build-tests' are mutually exclusive"))`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`do {`
`163`	`163`	`_ = try execute(["--product", "UnkownProduct"], packagePath: path)`
`164`	`164`	`XCTFail("Expected to fail")`
`165`	`165`	`} catch SwiftPMProductError.executionFailure(_, _, let stderr) {`
`166`		`- XCTAssertEqual(stderr, "error: no product named 'UnkownProduct'\n")`
	`166`	`+ XCTAssertMatch(stderr, .contains("error: no product named 'UnkownProduct'"))`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`do {`
`170`	`170`	`_ = try execute(["--target", "UnkownTarget"], packagePath: path)`
`171`	`171`	`XCTFail("Expected to fail")`
`172`	`172`	`} catch SwiftPMProductError.executionFailure(_, _, let stderr) {`
`173`		`- XCTAssertEqual(stderr, "error: no target named 'UnkownTarget'\n")`
	`173`	`+ XCTAssertMatch(stderr, .contains("error: no target named 'UnkownTarget'"))`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -852,7 +852,7 @@ final class PackageToolTests: CommandsTestCase {`
`852`	`852`	`try execute("resolve", "bar")`
`853`	`853`	`XCTFail("This should have been an error")`
`854`	`854`	`} catch SwiftPMProductError.executionFailure(_, _, let stderr) {`
`855`		`- XCTAssertMatch(stderr, .prefix("error: edited dependency 'bar' can't be resolved"))`
	`855`	`+ XCTAssertMatch(stderr, .contains("error: edited dependency 'bar' can't be resolved"))`
`856`	`856`	`}`
`857`	`857`	`try execute("unedit", "bar")`
`858`	`858`	`}`
`@@ -979,7 +979,7 @@ final class PackageToolTests: CommandsTestCase {`
`979`	`979`	`try block()`
`980`	`980`	`XCTFail()`
`981`	`981`	`} catch SwiftPMProductError.executionFailure(_, _, let stderrOutput) {`
`982`		`- XCTAssertEqual(stderrOutput, stderr)`
	`982`	`+ XCTAssertMatch(stderrOutput, .contains(stderr))`
`983`	`983`	`} catch {`
`984`	`984`	`XCTFail("unexpected error: \(error)")`
`985`	`985`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ final class RunToolTests: CommandsTestCase {`
`57`	`57`	`_ = try execute(["unknown"], packagePath: path)`
`58`	`58`	`XCTFail("Unexpected success")`
`59`	`59`	`} catch SwiftPMProductError.executionFailure(_, _, let stderr) {`
`60`		`- XCTAssertEqual(stderr, "error: no executable product named 'unknown'\n")`
	`60`	`+ XCTAssertMatch(stderr, .contains("error: no executable product named 'unknown'"))`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`	`}`
`@@ -68,7 +68,7 @@ final class RunToolTests: CommandsTestCase {`
`68`	`68`	`_ = try execute([], packagePath: path)`
`69`	`69`	`XCTFail("Unexpected success")`
`70`	`70`	`} catch SwiftPMProductError.executionFailure(_, _, let stderr) {`
`71`		`- XCTAssertEqual(stderr, "error: multiple executable products available: exec1, exec2\n")`
	`71`	`+ XCTAssertMatch(stderr, .contains("error: multiple executable products available: exec1, exec2"))`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`var (runOutput, _) = try execute(["exec1"], packagePath: path)`
`@@ -103,7 +103,7 @@ final class RunToolTests: CommandsTestCase {`
`103`	`103`	`_ = try execute(["--build-tests", "--skip-build"], packagePath: path)`
`104`	`104`	`XCTFail("Expected to fail")`
`105`	`105`	`} catch SwiftPMProductError.executionFailure(_, _, let stderr) {`
`106`		`- XCTAssertEqual(stderr, "error: '--build-tests' and '--skip-build' are mutually exclusive\n")`
	`106`	`+ XCTAssertMatch(stderr, .contains("error: '--build-tests' and '--skip-build' are mutually exclusive"))`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ final class TestToolTests: CommandsTestCase {`
`41`	`41`	`do {`
`42`	`42`	`_ = try execute(["--num-workers", "1"])`
`43`	`43`	`} catch SwiftPMProductError.executionFailure(_, _, let stderr) {`
`44`		`- XCTAssertEqual(stderr, "error: --num-workers must be used with --parallel\n")`
	`44`	`+ XCTAssertMatch(stderr, .contains("error: --num-workers must be used with --parallel"))`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`	`#endif`
`@@ -53,7 +53,7 @@ final class TestToolTests: CommandsTestCase {`
`53`	`53`	`do {`
`54`	`54`	`_ = try execute(["--parallel", "--num-workers", "0"])`
`55`	`55`	`} catch SwiftPMProductError.executionFailure(_, _, let stderr) {`
`56`		`- XCTAssertEqual(stderr, "error: '--num-workers' must be greater than zero\n")`
	`56`	`+ XCTAssertMatch(stderr, .contains("error: '--num-workers' must be greater than zero"))`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`	`#endif`