Fix filesystem test on macOS (#466)

MaxDesiatov · neonichu · web-flow · commit 80d88137b442 · 2024-05-04T14:47:30.000-07:00
It looks like we end up with `EEXISTS` here on newer versions of macOS.

Co-authored-by: Boris Buegling &lt;bbuegling@apple.com&gt;
diff --git a/Sources/TSCBasic/FileSystem.swift b/Sources/TSCBasic/FileSystem.swift
@@ -104,6 +104,8 @@ public extension FileSystemError {
             self.init(.noEntry, path)
         case TSCLibc.ENOTDIR:
             self.init(.notDirectory, path)
+        case TSCLibc.EEXIST:
+            self.init(.alreadyExistsAtDestination, path)
         default:
             self.init(.ioError(code: errno), path)
         }
diff --git a/Tests/TSCBasicTests/FileSystemTests.swift b/Tests/TSCBasicTests/FileSystemTests.swift
@@ -331,7 +331,13 @@ class FileSystemTests: XCTestCase {
                 _ = try fs.readFileContents(root)
 
             }
-            XCTAssertThrows(FileSystemError(.isDirectory, root)) {
+            #if os(macOS)
+            // Newer versions of macOS end up with `EEXISTS` instead of `EISDIR` here.
+            let expectedError = FileSystemError(.alreadyExistsAtDestination, root)
+            #else
+            let expectedError = FileSystemError(.isDirectory, root)
+            #endif
+            XCTAssertThrows(expectedError) {
                 try fs.writeFileContents(root, bytes: [])
             }
             XCTAssert(fs.exists(filePath))

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,8 @@ public extension FileSystemError {`
`104`	`104`	`self.init(.noEntry, path)`
`105`	`105`	`case TSCLibc.ENOTDIR:`
`106`	`106`	`self.init(.notDirectory, path)`
	`107`	`+ case TSCLibc.EEXIST:`
	`108`	`+ self.init(.alreadyExistsAtDestination, path)`
`107`	`109`	`default:`
`108`	`110`	`self.init(.ioError(code: errno), path)`
`109`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,13 @@ class FileSystemTests: XCTestCase {`
`331`	`331`	`_ = try fs.readFileContents(root)`
`332`	`332`
`333`	`333`	`}`
`334`		`- XCTAssertThrows(FileSystemError(.isDirectory, root)) {`
	`334`	`+ #if os(macOS)`
	`335`	+ // Newer versions of macOS end up with `EEXISTS` instead of `EISDIR` here.
	`336`	`+ let expectedError = FileSystemError(.alreadyExistsAtDestination, root)`
	`337`	`+ #else`
	`338`	`+ let expectedError = FileSystemError(.isDirectory, root)`
	`339`	`+ #endif`
	`340`	`+ XCTAssertThrows(expectedError) {`
`335`	`341`	`try fs.writeFileContents(root, bytes: [])`
`336`	`342`	`}`
`337`	`343`	`XCTAssert(fs.exists(filePath))`