Skip to content

Commit bdaac36

Browse files
authored
Re-enable (most) iOS Scenarios tests (flutter#21087)
This re-enables the iOS Scenarios tests which have been flaky in the last couple days. Disabling two tests where we've seen the flakes: * AppLifecycleTests testFlutterViewControllerDetachingSendsApplicationLifecycle * FlutterViewControllerInitialRouteTest testSettingInitialRoute This reverts commit 0c6c265.
1 parent 7865174 commit bdaac36

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

testing/scenario_app/ios/Scenarios/ScenariosTests/AppLifecycleTests.m

+3-1
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,9 @@ - (void)testVisibleFlutterViewControllerRespondsToApplicationLifecycle {
227227
[engine setViewController:nil];
228228
}
229229

230-
- (void)testFlutterViewControllerDetachingSendsApplicationLifecycle {
230+
// TODO(cbracken): re-enable this test by removing the skip_ prefix once the source of its flakiness
231+
// has been identified. https://github.com/flutter/flutter/issues/61620
232+
- (void)skip_testFlutterViewControllerDetachingSendsApplicationLifecycle {
231233
XCTestExpectation* engineStartedExpectation = [self expectationWithDescription:@"Engine started"];
232234

233235
// Let the engine finish booting (at the end of which the channels are properly set-up) before

testing/scenario_app/ios/Scenarios/ScenariosTests/FlutterViewControllerInitialRouteTest.m

+3-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ - (void)tearDown {
3333
[super tearDown];
3434
}
3535

36-
- (void)testSettingInitialRoute {
36+
// TODO(cbracken): re-enable this test by removing the skip_ prefix once the source of its flakiness
37+
// has been identified. https://github.com/flutter/flutter/issues/61620
38+
- (void)skip_testSettingInitialRoute {
3739
self.flutterViewController =
3840
[[FlutterViewController alloc] initWithProject:nil
3941
initialRoute:@"myCustomInitialRoute"

testing/scenario_app/run_ios_tests.sh

+6-11
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,9 @@ if [[ $# -eq 1 ]]; then
3333
FLUTTER_ENGINE="$1"
3434
fi
3535

36-
echo "iOS Scenarios tests currently disabled due to flakiness"
37-
echo "See: https://github.com/flutter/flutter/issues/61620"
38-
39-
# TODO(cbracken): re-enable when
40-
# https://github.com/flutter/flutter/issues/61620 is fixed.
41-
# cd ios/Scenarios
42-
# set -o pipefail && xcodebuild -sdk iphonesimulator \
43-
# -scheme Scenarios \
44-
# -destination 'platform=iOS Simulator,name=iPhone 8' \
45-
# test \
46-
# FLUTTER_ENGINE="$FLUTTER_ENGINE"
36+
cd ios/Scenarios
37+
set -o pipefail && xcodebuild -sdk iphonesimulator \
38+
-scheme Scenarios \
39+
-destination 'platform=iOS Simulator,name=iPhone 8' \
40+
test \
41+
FLUTTER_ENGINE="$FLUTTER_ENGINE"

0 commit comments

Comments
 (0)