Another attempt to fix tests on Linux

Author: nezhyborets

Tests/OpenAITests/ServerSentEventsStreamInterpreterTests.swift

@@ -84,25 +84,16 @@ struct ServerSentEventsStreamInterpreterTests {
         #expect(error is APIErrorResponse)
     }
 
-    // Chunk with 3 objects. I captured it from a real response. It's a very short response that contains just "Hi"
-    static func chatCompletionChunk() -> Data {
-        "data: {\"id\":\"chatcmpl-AwnboO5ZnaUyii9xxC5ZVmM5vGark\",\"object\":\"chat.completion.chunk\",\"created\":1738577084,\"model\":\"gpt-4-0613\",\"service_tier\":\"default\",\"system_fingerprint\":\"sysfig\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"\",\"refusal\":null},\"logprobs\":null,\"finish_reason\":null}]}\n\ndata: {\"id\":\"chatcmpl-AwnboO5ZnaUyii9xxC5ZVmM5vGark\",\"object\":\"chat.completion.chunk\",\"created\":1738577084,\"model\":\"gpt-4-0613\",\"service_tier\":\"default\",\"system_fingerprint\":\"sysfig\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"Hi\"},\"logprobs\":null,\"finish_reason\":null}]}\n\ndata: {\"id\":\"chatcmpl-AwnboO5ZnaUyii9xxC5ZVmM5vGark\",\"object\":\"chat.completion.chunk\",\"created\":1738577084,\"model\":\"gpt-4-0613\",\"service_tier\":\"default\",\"system_fingerprint\":\"sysfig\",\"choices\":[{\"index\":0,\"delta\":{},\"logprobs\":null,\"finish_reason\":\"stop\"}]}\n\n".data(using: .utf8)!
-    }
-    
     private func chatCompletionChunk() -> Data {
-        type(of: self).chatCompletionChunk()
+        MockServerSentEvent.chatCompletionChunk()
     }
 
     private func chatCompletionChunkWithComment() -> Data {
         ": OPENROUTER PROCESSING\n\ndata: {\"id\":\"chatcmpl-AwnboO5ZnaUyii9xxC5ZVmM5vGark\",\"object\":\"chat.completion.chunk\",\"created\":1738577084,\"model\":\"gpt-4-0613\",\"service_tier\":\"default\",\"system_fingerprint\":\"sysfig\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"\",\"refusal\":null},\"logprobs\":null,\"finish_reason\":null}]}\n\n".data(using: .utf8)!
     }
 
-    static func chatCompletionChunkTermination() -> Data {
-        "data: [DONE]\n\n".data(using: .utf8)!
-    }
-    
     private func chatCompletionChunkTermination() -> Data {
-        type(of: self).chatCompletionChunkTermination()
+        MockServerSentEvent.chatCompletionChunkTermination()
     }
 
     // Copied from an actual reponse that was an input to inreptreter
@@ -114,3 +105,14 @@ struct ServerSentEventsStreamInterpreterTests {
 private actor ChatStreamResultsActor {
     var chatStreamResults: [ChatStreamResult] = []
 }
+
+struct MockServerSentEvent {
+    // Chunk with 3 objects. I captured it from a real response. It's a very short response that contains just "Hi"
+    static func chatCompletionChunk() -> Data {
+        "data: {\"id\":\"chatcmpl-AwnboO5ZnaUyii9xxC5ZVmM5vGark\",\"object\":\"chat.completion.chunk\",\"created\":1738577084,\"model\":\"gpt-4-0613\",\"service_tier\":\"default\",\"system_fingerprint\":\"sysfig\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"\",\"refusal\":null},\"logprobs\":null,\"finish_reason\":null}]}\n\ndata: {\"id\":\"chatcmpl-AwnboO5ZnaUyii9xxC5ZVmM5vGark\",\"object\":\"chat.completion.chunk\",\"created\":1738577084,\"model\":\"gpt-4-0613\",\"service_tier\":\"default\",\"system_fingerprint\":\"sysfig\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"Hi\"},\"logprobs\":null,\"finish_reason\":null}]}\n\ndata: {\"id\":\"chatcmpl-AwnboO5ZnaUyii9xxC5ZVmM5vGark\",\"object\":\"chat.completion.chunk\",\"created\":1738577084,\"model\":\"gpt-4-0613\",\"service_tier\":\"default\",\"system_fingerprint\":\"sysfig\",\"choices\":[{\"index\":0,\"delta\":{},\"logprobs\":null,\"finish_reason\":\"stop\"}]}\n\n".data(using: .utf8)!
+    }
+    
+    static func chatCompletionChunkTermination() -> Data {
+        "data: [DONE]\n\n".data(using: .utf8)!
+    }
+}

Tests/OpenAITests/StreamingSessionIntegrationTests.swift

@@ -8,7 +8,6 @@
 import XCTest
 @testable import OpenAI
 
-@MainActor
 final class StreamingSessionIntegrationTests: XCTestCase {
     private enum Call {
         case content
@@ -34,47 +33,36 @@ final class StreamingSessionIntegrationTests: XCTestCase {
         middlewares: [],
         executionSerializer: executionSerializer,
         onReceiveContent: { _, _ in
-            Task {
-                await MainActor.run {
-                    self.calls.append(.content)
-                    self.expectation.fulfill()
-                }
-            }
+            self.calls.append(.content)
+            self.expectation.fulfill()
         },
         onProcessingError: { _, _ in },
         onComplete: { _,_ in
-            Task {
-                await MainActor.run {
-                    self.calls.append(.complete)
-                    self.expectation.fulfill()
-                }
-            }
+            self.calls.append(.complete)
+            self.expectation.fulfill()
         }
     )
 
-    @MainActor
     func testCompleteCalledAfterAllEventsWithMockSerializer() {
         XCTAssertTrue(executionSerializer is NoDispatchExecutionSerializer)
         let asserted = testCompleteCalledAfterAllEvents()
         XCTAssertTrue(asserted)
     }
 
-    @MainActor
     func testCompleteCalledAfterAllEventsWithRealSerializer() {
         executionSerializer = GCDQueueAsyncExecutionSerializer(queue: .userInitiated)
         let asserted = testCompleteCalledAfterAllEvents()
         XCTAssertTrue(asserted)
     }
 
-    @MainActor
     private func testCompleteCalledAfterAllEvents() -> Bool {
         _ = streamingSession
         let cancellable = streamingSession.makeSession()
 
-        let dataEvent = ServerSentEventsStreamInterpreterTests.chatCompletionChunk()
+        let dataEvent = MockServerSentEvent.chatCompletionChunk()
         streamInterpreter.processData(dataEvent)
 
-        let doneEvent = ServerSentEventsStreamInterpreterTests.chatCompletionChunkTermination()
+        let doneEvent = MockServerSentEvent.chatCompletionChunkTermination()
         streamInterpreter.processData(doneEvent)
 
         let urlSession = urlSessionFactory.urlSession