Merge pull request #5 from IATabachnikov/Fix-fatalError

Removed fatalError in start() method
tinkoff-mobile-tech · Mar 15, 2022 · 21562c0 · 21562c0
2 parents 8dff053 + 61c7de5
commit 21562c0
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/Development/Source/Swifter/MockNetworkServer.swift b/Development/Source/Swifter/MockNetworkServer.swift
@@ -81,13 +81,19 @@ extension MockNetworkServer: MockNetworkServerProtocol {
         }
 
         server = HttpServer()
-        start(server: server, on: port)
+        do {
+            try server?.start(port)
+        } catch {
+            server = nil
+            return nil
+        }
 
         server?.notFoundHandler = { _ in
             .notFound
         }
 
         guard let port = try? server?.port() else {
+            server = nil
             return nil
         }
 
@@ -105,16 +111,6 @@ extension MockNetworkServer: MockNetworkServerProtocol {
         removeAllStubs()
         server = nil
     }
-
-    // MARK: Private
-
-    private func start(server: HttpServer?, on port: in_port_t) {
-        do {
-            try server?.start(port)
-        } catch {
-            fatalError("Couldn't start the mock network server. \n\(String(describing: error))")
-        }
-    }
 }
 
 // MARK: - Private API