summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Wray <jason@mapbox.com>2018-09-26 13:19:27 -0700
committerJason Wray <friedbunny@users.noreply.github.com>2018-09-26 14:12:57 -0700
commit1ce31af2899e8e8526e968f908b75ec949d8ffeb (patch)
tree8455b811c7a9a302e82c87fc727ae43e0e1c6400
parent20b33ad5daf5ffe546e01139c320715e3ae8b6dd (diff)
downloadqtlocation-mapboxgl-1ce31af2899e8e8526e968f908b75ec949d8ffeb.tar.gz
[ios] Bump more test timeouts for Xcode 10 sluggishness
-rw-r--r--platform/darwin/test/MGLOfflineStorageTests.mm5
-rw-r--r--platform/darwin/test/MGLStyleTests.mm2
-rw-r--r--platform/ios/Integration Tests/MBGLIntegrationTests.m4
-rw-r--r--platform/ios/Integration Tests/MGLStyleLayerIntegrationTests.m4
4 files changed, 7 insertions, 8 deletions
diff --git a/platform/darwin/test/MGLOfflineStorageTests.mm b/platform/darwin/test/MGLOfflineStorageTests.mm
index ad6e1a0570..4cdb87946e 100644
--- a/platform/darwin/test/MGLOfflineStorageTests.mm
+++ b/platform/darwin/test/MGLOfflineStorageTests.mm
@@ -43,7 +43,7 @@
[expectation fulfill];
[self waitForExpectationsWithTimeout:0 handler:nil];
} else {
- [self waitForExpectationsWithTimeout:5 handler:nil];
+ [self waitForExpectationsWithTimeout:10 handler:nil];
}
XCTAssertNotNil([MGLOfflineStorage sharedOfflineStorage].packs, @"Shared offline storage object should have a non-nil collection of packs by this point.");
@@ -283,8 +283,7 @@
}
- (void)testAddFileContent {
-
-
+
// Valid database
{
NSURL *resourceURL = [NSURL fileURLWithPath:[[NSBundle bundleForClass:[self class]] pathForResource:@"barcelona" ofType:@"db"]];
diff --git a/platform/darwin/test/MGLStyleTests.mm b/platform/darwin/test/MGLStyleTests.mm
index ccab5961c9..d317292096 100644
--- a/platform/darwin/test/MGLStyleTests.mm
+++ b/platform/darwin/test/MGLStyleTests.mm
@@ -33,7 +33,7 @@
self.mapView.delegate = self;
if (!self.mapView.style) {
_styleLoadingExpectation = [self expectationWithDescription:@"Map view should finish loading style."];
- [self waitForExpectationsWithTimeout:5 handler:nil];
+ [self waitForExpectationsWithTimeout:10 handler:nil];
}
}
diff --git a/platform/ios/Integration Tests/MBGLIntegrationTests.m b/platform/ios/Integration Tests/MBGLIntegrationTests.m
index aeff0ba6f3..849b6e3dc5 100644
--- a/platform/ios/Integration Tests/MBGLIntegrationTests.m
+++ b/platform/ios/Integration Tests/MBGLIntegrationTests.m
@@ -8,7 +8,7 @@
#pragma mark - Tests
- (void)waitForMapViewToBeRendered {
- [self waitForMapViewToBeRenderedWithTimeout:1];
+ [self waitForMapViewToBeRenderedWithTimeout:5];
}
// This test does not strictly need to be in this test file/target. Including here for convenience.
@@ -186,7 +186,7 @@
XCTAssertNil(mapView2.style);
self.styleLoadingExpectation = [self expectationWithDescription:@"Map view should finish loading style."];
- [self waitForExpectationsWithTimeout:5 handler:nil];
+ [self waitForExpectationsWithTimeout:10 handler:nil];
MGLOpenGLStyleLayer *layer = [[MGLOpenGLStyleLayer alloc] initWithIdentifier:@"gl-layer"];
weakLayer = layer;
diff --git a/platform/ios/Integration Tests/MGLStyleLayerIntegrationTests.m b/platform/ios/Integration Tests/MGLStyleLayerIntegrationTests.m
index 015a58d2d2..0cb4461c37 100644
--- a/platform/ios/Integration Tests/MGLStyleLayerIntegrationTests.m
+++ b/platform/ios/Integration Tests/MGLStyleLayerIntegrationTests.m
@@ -37,7 +37,7 @@
XCTAssertThrowsSpecificNamed((layer.circleColor = interpExpression), NSException, NSInvalidArgumentException);
[self.mapView.style addLayer:layer];
- [self waitForMapViewToBeRenderedWithTimeout:1.0];
+ [self waitForMapViewToBeRenderedWithTimeout:5];
}
- (void)testForSteppingExpressionRenderCrashWithEmptyStops {
@@ -55,7 +55,7 @@
XCTAssertThrowsSpecificNamed((layer.circleColor = steppingExpression), NSException, NSInvalidArgumentException);
[self.mapView.style addLayer:layer];
- [self waitForMapViewToBeRenderedWithTimeout:1.0];
+ [self waitForMapViewToBeRenderedWithTimeout:5];
}
@end