Work in progress: Fixing tests.

Signed-off-by: Iva Horn <iva.horn@nextcloud.com>

Author: i2h3

Sources/NextcloudFileProviderKit/Enumeration/RemoteChangeObserver.swift

@@ -126,15 +126,18 @@ public actor RemoteChangeObserver: NSObject, Sendable {
     private func reconnectWebSocket() {
         stopPollingTimer()
         resetWebSocket()
+
         guard networkReachability != .notReachable else {
             logger.error("Network unreachable, will retry when reconnected.")
             return
         }
+
         guard webSocketAuthenticationFailCount < webSocketAuthenticationFailLimit else {
             logger.error("Exceeded authentication failures for notify push websocket \(account.ncKitAccount), will poll instead.", [.account: account.ncKitAccount])
             startPollingTimer()
             return
         }
+        
         Task { [weak self] in
             try await Task.sleep(nanoseconds: self?.webSocketReconfigureIntervalNanoseconds ?? 0)
             await self?.configureNotifyPush()

Tests/Interface/MockNotifyPushServer.swift

@@ -60,10 +60,7 @@ public class MockNotifyPushServer: @unchecked Sendable {
     public func run() async throws {
         let channel: NIOAsyncChannel<EventLoopFuture<UpgradeResult>, Never> = try await ServerBootstrap(group: eventLoopGroup)
             .serverChannelOption(ChannelOptions.socketOption(.so_reuseaddr), value: 1)
-            .bind(
-                host: host,
-                port: port
-            ) { channel in
+            .bind(host: host, port: port) { channel in
                 channel.eventLoop.makeCompletedFuture {
                     let upgrader = NIOTypedWebSocketServerUpgrader<UpgradeResult>(
                         shouldUpgrade: { channel, _ in

Tests/NextcloudFileProviderKitTests/RemoteChangeObserverTests.swift

@@ -35,7 +35,11 @@ final class RemoteChangeObserverTests: NextcloudFileProviderKitTestCase {
 
     override func setUp() async throws {
         Realm.Configuration.defaultConfiguration.inMemoryIdentifier = name
-        try await Self.notifyPushServer.run()
+        let server = Self.notifyPushServer
+
+        Task {
+            try await server.run()
+        }
     }
 
     override func tearDown() async throws {
@@ -57,6 +61,7 @@ final class RemoteChangeObserverTests: NextcloudFileProviderKitTestCase {
         remoteInterface.capabilities = mockCapabilities
 
         let authenticated = expectation(description: "authenticated")
+        authenticated.assertForOverFulfill = false
 
         NotificationCenter.default.addObserver(forName: NotifyPushAuthenticatedNotificationName, object: nil, queue: nil) { _ in
             authenticated.fulfill()

Tests/NextcloudFileProviderKitTests/RemoteInterfaceTests.swift

@@ -130,9 +130,7 @@ struct RemoteInterfaceExtensionTests {
         }
 
         // 1. Simulate an external process starting a fetch for testAccount
-        await RetrievedCapabilitiesActor.shared.setOngoingFetch(
-            forAccount: testAccount.ncKitAccount, ongoing: true
-        )
+        await RetrievedCapabilitiesActor.shared.setOngoingFetch(forAccount: testAccount.ncKitAccount, ongoing: true)
 
         await confirmation("currentCapabilitiesReturned") { currentCapabilitiesReturned in
             let currentCapabilitiesTask = Task { @Sendable in
@@ -144,17 +142,17 @@ struct RemoteInterfaceExtensionTests {
                 #expect(result.error == .success)
             }
 
-            await currentCapabilitiesTask.value
-        }
+            // 3. Now, the "external" fetch completes and populates the cache.
+            await RetrievedCapabilitiesActor.shared.setCapabilities(
+                forAccount: testAccount.ncKitAccount,
+                capabilities: cachedCaps,
+                retrievedAt: Date() // Fresh date
+            )
 
-        // 4. Now, the "external" fetch completes and populates the cache.
-        await RetrievedCapabilitiesActor.shared.setCapabilities(
-            forAccount: testAccount.ncKitAccount,
-            capabilities: cachedCaps,
-            retrievedAt: Date() // Fresh date
-        )
+            await RetrievedCapabilitiesActor.shared.setOngoingFetch(forAccount: testAccount.ncKitAccount, ongoing: false)
 
-        await RetrievedCapabilitiesActor.shared.setOngoingFetch(forAccount: testAccount.ncKitAccount, ongoing: false)
+            await currentCapabilitiesTask.value
+        }
     }
 
     @Test func supportsTrashTrue() async throws {