Fix filesystem test on macOS (#466)

It looks like we end up with `EEXISTS` here on newer versions of macOS. Co-authored-by: Boris Buegling <[email protected]>
swiftlang · May 4, 2024 · 80d8813 · 80d8813
1 parent 3695ee4
commit 80d8813
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
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))