Improve Package.swift not found diagnostic error SR-14829 (#3601)

a-sarris · web-flow · commit a16a93428d2b · 2021-07-19T10:37:59.000-07:00
* Make Package.swift not found error more descriptive SR-14829
diff --git a/Sources/Commands/Error.swift b/Sources/Commands/Error.swift
@@ -30,7 +30,7 @@ extension Error: CustomStringConvertible {
         case .invalidToolchain(let problem):
             return problem
         case .rootManifestFileNotFound:
-            return "root manifest not found"
+            return "Could not find \(Manifest.filename) in this directory or any of its parent directories."
         }
     }
 }
diff --git a/Tests/CommandsTests/PackageToolTests.swift b/Tests/CommandsTests/PackageToolTests.swift
@@ -1062,7 +1062,7 @@ final class PackageToolTests: XCTestCase {
                 XCTAssertEqual(result.exitStatus, .terminated(code: 1))
 
                 let stderrOutput = try result.utf8stderrOutput()
-                XCTAssert(stderrOutput.contains("error: root manifest not found"), #"actual: "\#(stderrOutput)""#)
+                XCTAssert(stderrOutput.contains("error: Could not find Package.swift in this directory or any of its parent directories."), #"actual: "\#(stderrOutput)""#)
             }
 
             // Runnning with output as absolute path to existing directory

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ extension Error: CustomStringConvertible {`
`30`	`30`	`case .invalidToolchain(let problem):`
`31`	`31`	`return problem`
`32`	`32`	`case .rootManifestFileNotFound:`
`33`		`- return "root manifest not found"`
	`33`	`+ return "Could not find \(Manifest.filename) in this directory or any of its parent directories."`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1062,7 +1062,7 @@ final class PackageToolTests: XCTestCase {`
`1062`	`1062`	`XCTAssertEqual(result.exitStatus, .terminated(code: 1))`
`1063`	`1063`
`1064`	`1064`	`let stderrOutput = try result.utf8stderrOutput()`
`1065`		`- XCTAssert(stderrOutput.contains("error: root manifest not found"), #"actual: "\#(stderrOutput)""#)`
	`1065`	`+ XCTAssert(stderrOutput.contains("error: Could not find Package.swift in this directory or any of its parent directories."), #"actual: "\#(stderrOutput)""#)`
`1066`	`1066`	`}`
`1067`	`1067`
`1068`	`1068`	`// Runnning with output as absolute path to existing directory`