FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix test failures by cancelling operations with the queue. It seems operations no longer can cancel themselves.

This commit is contained in:
Kiel Gillard 2020-01-17 08:27:20 +11:00
parent f7017aaed5
commit f14ba07740
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Frameworks/Account/AccountTests/Feedly/FeedlyCheckpointOperationTests.swift
View File

@ -55,7 +55,7 @@ class FeedlyCheckpointOperationTests: XCTestCase {
MainThreadOperationQueue.shared.addOperation(operation)
operation.cancel()
MainThreadOperationQueue.shared.cancelOperations([operation])
waitForExpectations(timeout: 1)
}

2
Frameworks/Account/AccountTests/Feedly/FeedlyLogoutOperationTests.swift
View File

@ -75,7 +75,7 @@ class FeedlyLogoutOperationTests: XCTestCase {
MainThreadOperationQueue.shared.addOperation(logout)
logout.cancel()
MainThreadOperationQueue.shared.cancelOperations([logout])
waitForExpectations(timeout: 1)

6
Frameworks/Account/AccountTests/Feedly/FeedlyOperationTests.swift
View File

@ -117,7 +117,7 @@ class FeedlyOperationTests: XCTestCase {
MainThreadOperationQueue.shared.addOperation(testOperation)
testOperation.cancel()
MainThreadOperationQueue.shared.cancelOperations([testOperation])
waitForExpectations(timeout: 2)
@ -180,8 +180,8 @@ class FeedlyOperationTests: XCTestCase {
MainThreadOperationQueue.shared.addOperation(testOperation)
XCTAssertTrue(progress.numberRemaining == 1)
testOperation.cancel()
XCTAssertTrue(progress.numberRemaining == 1)
MainThreadOperationQueue.shared.cancelOperations([testOperation])
XCTAssertTrue(progress.numberRemaining == 0)
waitForExpectations(timeout: 2)

2
Frameworks/Account/AccountTests/Feedly/FeedlyRefreshAccessTokenOperationTests.swift
View File

@ -63,7 +63,7 @@ class FeedlyRefreshAccessTokenOperationTests: XCTestCase {
MainThreadOperationQueue.shared.addOperation(refresh)
refresh.cancel()
MainThreadOperationQueue.shared.cancelOperations([refresh])
waitForExpectations(timeout: 1)

2
Frameworks/Account/AccountTests/Feedly/FeedlyUpdateAccountFeedsWithItemsOperationTests.swift
View File

@ -127,7 +127,7 @@ class FeedlyUpdateAccountFeedsWithItemsOperationTests: XCTestCase {
MainThreadOperationQueue.shared.addOperation(update)
update.cancel()
MainThreadOperationQueue.shared.cancelOperations([update])
waitForExpectations(timeout: 2)