diff --git a/Tests/OptimizelyTests-Common/EventDispatcherTests.swift b/Tests/OptimizelyTests-Common/EventDispatcherTests.swift index f68ad16d..bb146e05 100644 --- a/Tests/OptimizelyTests-Common/EventDispatcherTests.swift +++ b/Tests/OptimizelyTests-Common/EventDispatcherTests.swift @@ -35,7 +35,14 @@ class EventDispatcherTests: XCTestCase { } func testDefaultDispatcher() { - eventDispatcher = DefaultEventDispatcher(timerInterval: 10) + // mock the network so the flush doesn't depend on reaching the live event endpoint + class MockSessionEventDispatcher: DefaultEventDispatcher { + override func getSession() -> URLSession { + return MockUrlSession() + } + } + + eventDispatcher = MockSessionEventDispatcher(timerInterval: 10) let pEventD: OPTEventDispatcher = eventDispatcher! pEventD.flushEvents() @@ -162,7 +169,9 @@ class EventDispatcherTests: XCTestCase { let originalUrl = "https://logx.optimizely.com/v1/events" let customUrl = "https://google.com" let overrideUrl = "https://apple.com" - + // eventEndpoint is static; restore it so later tests (and xcodebuild retries) see the default + defer { EventForDispatch.eventEndpoint = originalUrl } + // default end-point dispatcher.dispatchEvent(event: EventForDispatch(body: Data()), completionHandler: nil) diff --git a/Tests/OptimizelyTests-Common/LruCacheTests.swift b/Tests/OptimizelyTests-Common/LruCacheTests.swift index ede0d260..05419f89 100644 --- a/Tests/OptimizelyTests-Common/LruCacheTests.swift +++ b/Tests/OptimizelyTests-Common/LruCacheTests.swift @@ -153,15 +153,19 @@ class LruCacheTests: XCTestCase { let numThreads = 100 let numIterationPerThread = 1000 - let cache = LruCache(size: 3, timeoutInSecs: 1) + let cache = LruCache(size: 3, timeoutInSecs: 60) let result = OTUtils.runConcurrent(count: numThreads, timeoutInSecs: 10) { idx in for i in 0..