From 46189916191187a2f14456f78fc1467904d09e88 Mon Sep 17 00:00:00 2001 From: Sim Date: Wed, 3 May 2023 10:29:57 +0930 Subject: [PATCH] Moved socket iteration into queue and fixed compile issue in FileTests --- Xcode/Sources/HttpServerIO.swift | 8 ++++---- Xcode/Tests/FilesTests.swift | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Xcode/Sources/HttpServerIO.swift b/Xcode/Sources/HttpServerIO.swift index 65c6e95a..9969abdb 100644 --- a/Xcode/Sources/HttpServerIO.swift +++ b/Xcode/Sources/HttpServerIO.swift @@ -100,11 +100,11 @@ open class HttpServerIO { public func stop() { guard self.operating else { return } self.state = .stopping - // Shutdown connected peers because they can live in 'keep-alive' or 'websocket' loops. - for socket in self.sockets { - socket.close() - } self.queue.sync { + // Shutdown connected peers because they can live in 'keep-alive' or 'websocket' loops. + for socket in self.sockets { + socket.close() + } self.sockets.removeAll(keepingCapacity: true) } socket.close() diff --git a/Xcode/Tests/FilesTests.swift b/Xcode/Tests/FilesTests.swift index 1f884844..2c82e5d8 100644 --- a/Xcode/Tests/FilesTests.swift +++ b/Xcode/Tests/FilesTests.swift @@ -55,7 +55,7 @@ class FilesTests: XCTestCase { let closure = shareFile(temporaryDirectoryURL.appendingPathComponent("does_not_exist").path) let result = closure(request) - XCTAssert(result == .notFound) + XCTAssert(result == .notFound()) } func testShareFilesFromDirectory() { @@ -77,7 +77,7 @@ class FilesTests: XCTestCase { let closure = shareFilesFromDirectory(temporaryDirectoryURL.path) let result = closure(request) - XCTAssert(result == .notFound) + XCTAssert(result == .notFound()) } func testDirectoryBrowser() { @@ -95,6 +95,6 @@ class FilesTests: XCTestCase { let closure = directoryBrowser(temporaryDirectoryURL.path) let result = closure(request) - XCTAssert(result == .notFound) + XCTAssert(result == .notFound()) } }