Fix merge

baumatron · baumatron · commit ab19bb5b1b24 · 2017-06-09T21:17:05.000-05:00
diff --git a/KeenClientTests/KeenEventTests.m b/KeenClientTests/KeenEventTests.m
@@ -931,7 +931,7 @@ - (void)testUploadEventDoesntDuplicateWithMultipleCallsToUpload {
         }];
     }
 
-    [self waitForExpectationsWithTimeout:_asyncTimeInterval
+    [self waitForExpectationsWithTimeout:kTestExpectationTimeoutInterval
                                  handler:^(NSError *_Nullable error) {
                                      // make sure the events were deleted locally
                                      XCTAssertTrue([client.store getTotalEventCountWithProjectID:nil] == 0,

Original file line number	Diff line number	Diff line change
`@@ -931,7 +931,7 @@ - (void)testUploadEventDoesntDuplicateWithMultipleCallsToUpload {`
`931`	`931`	`}];`
`932`	`932`	`}`
`933`	`933`
`934`		`- [self waitForExpectationsWithTimeout:_asyncTimeInterval`
	`934`	`+ [self waitForExpectationsWithTimeout:kTestExpectationTimeoutInterval`
`935`	`935`	`handler:^(NSError *_Nullable error) {`
`936`	`936`	`// make sure the events were deleted locally`
`937`	`937`	`XCTAssertTrue([client.store getTotalEventCountWithProjectID:nil] == 0,`