diff --git a/RxTests/RxSwiftTests/Tests/Observable+BlockingTest.swift b/RxTests/RxSwiftTests/Tests/Observable+BlockingTest.swift index a476d2fd..d083500c 100644 --- a/RxTests/RxSwiftTests/Tests/Observable+BlockingTest.swift +++ b/RxTests/RxSwiftTests/Tests/Observable+BlockingTest.swift @@ -13,7 +13,7 @@ import XCTest class ObservableBlockingTest : RxTest { override func tearDown() { - usleep(1000) + sleep(0.1) super.tearDown() } } diff --git a/RxTests/RxSwiftTests/Tests/Observable+ConcurrencyTest.swift b/RxTests/RxSwiftTests/Tests/Observable+ConcurrencyTest.swift index ce127ffd..b04cda9d 100644 --- a/RxTests/RxSwiftTests/Tests/Observable+ConcurrencyTest.swift +++ b/RxTests/RxSwiftTests/Tests/Observable+ConcurrencyTest.swift @@ -21,7 +21,7 @@ class ObservableConcurrencyTestBase : RxTest { override func tearDown() { #if TRACE_RESOURCES - usleep(500) // wait 0.5 ms for proper scheduler disposal + sleep(0.1) // wait 100 ms for proper scheduler disposal #endif super.tearDown() } @@ -266,7 +266,7 @@ extension ObservableConcurrencyTest { >- observeOn(scheduler) >- subscribeNext { e in XCTAssert(OSAtomicIncrement32(&numberOfConcurrentEvents) == 1) - usleep(1000) // should be enough to block the queue, so if it's concurrent, it will fail + self.sleep(0.1) // should be enough to block the queue, so if it's concurrent, it will fail XCTAssert(OSAtomicDecrement32(&numberOfConcurrentEvents) == 0) numberOfExecutions++ } @@ -494,7 +494,7 @@ class ObservableConcurrentSchedulerConcurrencyTest: ObservableConcurrencyTestBas compositeDisposable.addDisposable(runConcurentSchedulerTest(scheduler, test: test)) } - usleep(1000) // sleep 1ms + sleep(0.1) // sleep 100ms compositeDisposable.dispose() } @@ -654,7 +654,7 @@ class ObservableConcurrentSchedulerConcurrencyTest: ObservableConcurrencyTestBas >- observeOn(scheduler) >- map { v -> Int in if v == 0 { - usleep(100 * 1000) // 100 ms is enough + self.sleep(0.3) // 300 ms is enough executed = true } return v diff --git a/RxTests/RxSwiftTests/Tests/Observable+TimeTest.swift b/RxTests/RxSwiftTests/Tests/Observable+TimeTest.swift index ccdb75c9..5ea1a7c5 100644 --- a/RxTests/RxSwiftTests/Tests/Observable+TimeTest.swift +++ b/RxTests/RxSwiftTests/Tests/Observable+TimeTest.swift @@ -19,7 +19,7 @@ class ObservableTimeTest : RxTest { override func tearDown() { #if TRACE_RESOURCES - usleep(500) // wait 0.5 ms for proper scheduler disposal + sleep(0.1) // wait 100 ms for proper scheduler disposal #endif super.tearDown() @@ -791,8 +791,6 @@ extension ObservableTimeTest { OSSpinLockLock(&lock) XCTAssertTrue(observer.messages.count == 10) - - usleep(1000) } func testInterval_TimeSpan_Disposed() { diff --git a/RxTests/RxTest.swift b/RxTests/RxTest.swift index 3276633c..3b5a6712 100644 --- a/RxTests/RxTest.swift +++ b/RxTests/RxTest.swift @@ -59,6 +59,10 @@ class RxTest: XCTestCase { static let disposed = 1000 } + func sleep(time: NSTimeInterval) { + NSThread.sleepForTimeInterval(time) + } + private var startResourceCount: Int32 = 0 override func setUp() {