diff options
author | Muxi Yan <mxyan@google.com> | 2017-05-22 10:39:48 -0700 |
---|---|---|
committer | Muxi Yan <mxyan@google.com> | 2017-05-22 10:39:48 -0700 |
commit | 49b7f8349be4c5ca9d180133d35e57f912f0a373 (patch) | |
tree | e308993a0bf9f89957bad5f95378ba3ff9667541 /src/objective-c | |
parent | ec8e82507ebd9439d02d54937d0f4e8179e42fdc (diff) |
Remove synchronization in GRXBufferedPipe:writesFinishedWithError and change tests correspondingly
Diffstat (limited to 'src/objective-c')
-rw-r--r-- | src/objective-c/RxLibrary/GRXBufferedPipe.m | 5 | ||||
-rw-r--r-- | src/objective-c/tests/RxLibraryUnitTests.m | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/objective-c/RxLibrary/GRXBufferedPipe.m b/src/objective-c/RxLibrary/GRXBufferedPipe.m index 9dfe332eef..bffabc53f2 100644 --- a/src/objective-c/RxLibrary/GRXBufferedPipe.m +++ b/src/objective-c/RxLibrary/GRXBufferedPipe.m @@ -82,11 +82,6 @@ if (errorOrNil) { // No need to write pending values. [self finishWithError:_errorOrNil]; - } else { - // Wait until all the pending writes to be finished. - dispatch_sync(_writeQueue, ^{ - return; - }); } } diff --git a/src/objective-c/tests/RxLibraryUnitTests.m b/src/objective-c/tests/RxLibraryUnitTests.m index feade14eea..e2ff6e4598 100644 --- a/src/objective-c/tests/RxLibraryUnitTests.m +++ b/src/objective-c/tests/RxLibraryUnitTests.m @@ -166,6 +166,9 @@ [pipe writeValue:anyValue]; [pipe writesFinishedWithError:nil]; + // Wait buffered pipe to be flushed. + sleep(1); + // Then: XCTAssertEqual(handler.timesCalled, 1); XCTAssertEqualObjects(handler.value, anyValue); @@ -202,6 +205,7 @@ [pipe writesFinishedWithError:nil]; // then start the writeable [pipe startWithWriteable:writeable]; + sleep(1); // Then: XCTAssertEqual(handler.timesCalled, 1); |