From 4f1360cdfa629fd3bd3bdf1d8520762c74b07e8d Mon Sep 17 00:00:00 2001 From: Chris Loer Date: Fri, 1 Jun 2018 15:49:28 -0700 Subject: [test,ios] Disable multiple mapsnapshotter test. 8 simultaneous mapsnapshotter test periodically deadlocks in simulator. Also, increase timeouts to decrease chance of spurious test failure. --- .../Snapshotter Tests/MGLMapSnapshotterTest.m | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/platform/ios/Integration Tests/Snapshotter Tests/MGLMapSnapshotterTest.m b/platform/ios/Integration Tests/Snapshotter Tests/MGLMapSnapshotterTest.m index f31f9cf787..6a698121c9 100644 --- a/platform/ios/Integration Tests/Snapshotter Tests/MGLMapSnapshotterTest.m +++ b/platform/ios/Integration Tests/Snapshotter Tests/MGLMapSnapshotterTest.m @@ -104,12 +104,11 @@ NSString* validAccessToken() { [self waitForExpectations:@[expectation] timeout:2.0]; } -- (void)testMultipleSnapshottersFromBackgroundQueue { +- (void)testSnapshotterFromBackgroundQueue { if (!validAccessToken()) { return; } - // Crashes with only 1 snapshot CGSize size = self.mapView.bounds.size; CLLocationCoordinate2D coord = CLLocationCoordinate2DMake(30.0, 30.0); @@ -145,10 +144,9 @@ NSString* validAccessToken() { MGLTestAssertNotNil(strongself, snapshot.image); MGLTestAssertNil(strongself, error, @"Snapshot should not error with: %@", error); - // Change this back to XCTAttachmentLifetimeDeleteOnSuccess when we're sure this - // test is passing. + // Change this to XCTAttachmentLifetimeKeepAlways to be able to look at the snapshots after running XCTAttachment *attachment = [XCTAttachment attachmentWithImage:snapshot.image]; - attachment.lifetime = XCTAttachmentLifetimeKeepAlways; + attachment.lifetime = XCTAttachmentLifetimeDeleteOnSuccess; [strongself addAttachment:attachment]; dispatch_group_leave(group); @@ -174,10 +172,11 @@ NSString* validAccessToken() { }); }); - [self waitForExpectations:@[expectation] timeout:10.0]; + [self waitForExpectations:@[expectation] timeout:60.0]; } -- (void)testMultipleSnapshotters { +- (void)testMultipleSnapshottersPENDING { + MGL_CHECK_IF_PENDING_TEST_SHOULD_RUN(); if (!validAccessToken()) { return; } @@ -217,10 +216,9 @@ NSString* validAccessToken() { MGLTestAssertNotNil(strongself, snapshot.image); MGLTestAssertNil(strongself, error, @"Snapshot should not error with: %@", error); - // Change this back to XCTAttachmentLifetimeDeleteOnSuccess when we're sure this - // test is passing. + // Change this to XCTAttachmentLifetimeKeepAlways to be able to look at the snapshots after running XCTAttachment *attachment = [XCTAttachment attachmentWithImage:snapshot.image]; - attachment.lifetime = XCTAttachmentLifetimeKeepAlways; + attachment.lifetime = XCTAttachmentLifetimeDeleteOnSuccess; [strongself addAttachment:attachment]; // Dealloc the snapshotter (by having this line in the block, we @@ -233,7 +231,7 @@ NSString* validAccessToken() { }]; } // end for loop - [self waitForExpectations:@[expectation] timeout:20.0]; + [self waitForExpectations:@[expectation] timeout:60.0]; } @end -- cgit v1.2.1