Merge pull request #169 from swhitty/temporary-directory

Use temp directory for unix socket tests

Author: swhitty

FlyingSocks/Tests/AsyncSocketTests.swift

@@ -169,7 +169,7 @@ struct AsyncSocketTests {
         }
     }
 
-    @Test
+    @Test(.disabled("problematic test because file descriptor by openened by another parallel test"))
     func socket_Throws_WhenAlreadyCLosed() async throws {
         let s1 = try await AsyncSocket.make()
 
@@ -188,14 +188,8 @@ struct AsyncSocketTests {
         )
     }
 
-    #if canImport(WinSDK)
-    @Test
-    func datagramPairCreation_Throws() async throws {
-        await #expect(throws: SocketError.self) {
-            _ = try await AsyncSocket.makeDatagramPair()
-        }
-    }
-    #else
+#if !canImport(WinSDK)
+
     @Test
     func datagramSocketReceivesChunk_WhenAvailable() async throws {
         let (s1, s2, addr) = try await AsyncSocket.makeDatagramPair()
@@ -215,9 +209,7 @@ struct AsyncSocketTests {
         try s2.close()
         try? Socket.unlink(addr)
     }
-    #endif
 
-#if !canImport(WinSDK)
     #if canImport(Darwin)
     @Test
     func messageSequence_sendsMessage_receivesTuple() async throws {
@@ -314,7 +306,7 @@ extension AsyncSocket {
     }
 
     static func makeListening(pool: some AsyncSocketPool) throws -> AsyncSocket {
-        let tempFile = FileManager.default.temporaryDirectory.appendingPathComponent("\(UUID().uuidString.prefix(8)).sock")
+        let tempFile = try FileManager.default.makeTemporaryDirectory().appending(path: "socket")
         let address = sockaddr_un.unix(path: tempFile.path)
         try? Socket.unlink(address)
         defer { try? Socket.unlink(address) }
@@ -345,11 +337,10 @@ extension AsyncSocket {
         return (socket, port)
     }
 
+#if !canImport(WinSDK)
     static func makeDatagramPair() async throws -> (AsyncSocket, AsyncSocket, sockaddr_un) {
         let socketPair = try await makePair(pool: .client, type: .datagram)
-        guard let endpoint = FileManager.default.makeTemporaryFile() else {
-            throw SocketError.makeFailed("MakeTemporaryFile")
-        }
+        let endpoint = try FileManager.default.makeTemporaryDirectory().appending(path: "socket")
         let addr = sockaddr_un.unix(path: endpoint.path)
 
         try socketPair.1.socket.bind(to: addr)
@@ -359,6 +350,7 @@ extension AsyncSocket {
 
         return (socketPair.0, socketPair.1, addr)
     }
+#endif
 
     static func makePair() async throws -> (AsyncSocket, AsyncSocket) {
         try await makePair(pool: .client, type: .stream)

FlyingSocks/Tests/FileManager+TemporaryFile.swift

@@ -15,35 +15,33 @@
 @testable import FlyingSocks
 import Foundation
 
+
 extension FileManager {
-    func makeTemporaryFile() -> URL? {
-        let dirPath = temporaryDirectory.appendingPathComponent("FlyingSocks.XXXXXX")
-        return dirPath.withUnsafeFileSystemRepresentation { maybePath in
-            guard let path = maybePath else { return nil }
 
-            #if canImport(WinSDK)
-            let pathMax = Int(MAX_PATH)
-            #else
-            let pathMax = Int(PATH_MAX)
-            #endif
+#if canImport(WinSDK)
+    func makeTemporaryDirectory(template: String = "FlyingSocks.XXXXXX") throws -> URL {
+        let suffix = UUID().uuidString.replacingOccurrences(of: "-", with: "").prefix(6)
+        let url = temporaryDirectory.appendingPathComponent("FlyingSocks.\(suffix)", isDirectory: true)
+        try createDirectory(at: url, withIntermediateDirectories: true, attributes: nil)
+        return url
+    }
+    #else
+    func makeTemporaryDirectory(template: String = "FlyingSocks.XXXXXX") throws -> URL {
+        let base = temporaryDirectory.path
+        let needsSlash = base.hasSuffix("/") ? "" : "/"
+        var tmpl = Array((base + needsSlash + template).utf8CString)
 
-            var mutablePath = Array(repeating: Int8(0), count: pathMax)
-            mutablePath.withUnsafeMutableBytes { mutablePathBufferPtr in
-                mutablePathBufferPtr.baseAddress!.copyMemory(
-                    from: path, byteCount: Int(strlen(path)) + 1)
-            }
-            guard mktemp(&mutablePath) != nil else { return nil }
-            return URL(
-                fileURLWithFileSystemRepresentation: mutablePath, isDirectory: false,
-                relativeTo: nil)
+        let url = tmpl.withUnsafeMutableBufferPointer { buf -> URL? in
+            guard let p = buf.baseAddress, mkdtemp(p) != nil else { return nil }
+            let path = String(cString: p)
+            return URL(fileURLWithPath: path, isDirectory: true)
         }
-    }
-}
 
-func withTemporaryFile(f: (URL) -> ()) throws {
-    guard let tmp = FileManager.default.makeTemporaryFile() else {
-        throw SocketError.makeFailed("MakeTemporaryFile")
+        guard let url = url else {
+            throw SocketError.makeFailed("makeTemporaryDirectory()")
+        }
+        return url
     }
-    defer { try? FileManager.default.removeItem(atPath: tmp.path) }
-    f(tmp)
+#endif
 }
+

FlyingSocks/XCTests/AsyncSocketTests.swift

@@ -142,7 +142,7 @@ final class AsyncSocketTests: XCTestCase {
         await AsyncAssertThrowsError(try await s1.accept(), of: SocketError.self)
     }
 
-    func testSocket_Throws_WhenAlreadyCLosed() async throws {
+    func disabled_testSocket_Throws_WhenAlreadyCLosed() async throws {
         let s1 = try await AsyncSocket.make()
 
         try s1.close()