FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1296 from kielgillard/failing-tests

Browse Source 
Fix failing Feedly tests.
This commit is contained in:
Maurice Parker 2019-11-14 16:44:21 -06:00 committed by GitHub
commit 6e8d1a90a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,6 +102,7 @@ class FeedlyOperationTests: XCTestCase {
func testOperationCancellationFlags() { func testOperationCancellationFlags() {
let testOperation = TestOperation() let testOperation = TestOperation()
testOperation.didCallMainExpectation = expectation(description: "Did Call Main") testOperation.didCallMainExpectation = expectation(description: "Did Call Main")
testOperation.didCallMainExpectation?.isInverted = true
let completionExpectation = expectation(description: "Operation Completed") let completionExpectation = expectation(description: "Operation Completed")
testOperation.completionBlock = { testOperation.completionBlock = {

4
Frameworks/Account/AccountTests/Feedly/FeedlySyncAllOperationTests.swift
View File

@ -67,11 +67,13 @@ class FeedlySyncAllOperationTests: XCTestCase {
} }
let syncCompletionExpectation = expectation(description: "Did Finish Sync") let syncCompletionExpectation = expectation(description: "Did Finish Sync")
syncCompletionExpectation.isInverted = true
syncAll.syncCompletionHandler = { result in syncAll.syncCompletionHandler = { result in
switch result { switch result {
case .success: case .success:
XCTFail("Expected failure.") XCTFail("Sync operation was cancelled, not successful.")
case .failure: case .failure:
XCTFail("Sync operation should cancel silently.")
break break
} }
syncCompletionExpectation.fulfill() syncCompletionExpectation.fulfill()

3
Frameworks/Account/Feedly/Operations/FeedlySyncAllOperation.swift
View File

@ -97,6 +97,9 @@ final class FeedlySyncAllOperation: FeedlyOperation {
super.cancel() super.cancel()
didFinish() didFinish()
// Operation should silently cancel.
syncCompletionHandler = nil
} }
override func main() { override func main() {