Skip to content

Commit 5b328b1

Browse files
committed
Merge branch 'ios-disable-bad-tests'
2 parents f53a4ce + d93fbdc commit 5b328b1

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

ios/MullvadVPNTests/MullvadVPN/TunnelManager/TunnelManagerTests.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ class TunnelManagerTests: XCTestCase {
254254

255255
/// This test verifies tunnel gets disconnected and reconnected on config reapply.
256256
func testReapplyingConfigDisconnectsAndReconnects() async throws {
257+
throw XCTSkip("TODO: Fix this flaky test or relieve it of it's misery")
257258
var connectedExpectation = expectation(description: "Connected!")
258259
let disconnectedExpectation = expectation(description: "Disconnected!")
259260

ios/PacketTunnelCore/TunnelMonitor/TunnelMonitor.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,13 +333,13 @@ public final class TunnelMonitor: TunnelMonitorProtocol, @unchecked Sendable {
333333
self?.checkConnectivity()
334334
}
335335
timer.schedule(wallDeadline: .now(), repeating: timings.connectivityCheckInterval.timeInterval)
336+
/// The timeout reference must be set before the timer is activated as the scheduled task will read from it.
337+
state.timeoutReference = Date()
336338
timer.activate()
337339

338340
self.timer?.cancel()
339341
self.timer = timer
340342

341-
state.timeoutReference = Date()
342-
343343
logger.trace("Start connectivity check timer.")
344344
}
345345

0 commit comments

Comments
 (0)