stoped keeping the spawner alive

flutter · Dec 17, 2020 · d4673d9 · d4673d9
1 parent 54b2745
commit d4673d9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/testing/scenario_app/ios/Scenarios/Scenarios/AppDelegate.m b/testing/scenario_app/ios/Scenarios/Scenarios/AppDelegate.m
@@ -81,17 +81,12 @@ - (BOOL)application:(UIApplication*)application
   return [super application:application didFinishLaunchingWithOptions:launchOptions];
 }
 
-// TODO(https://github.com/flutter/flutter/issues/72019) Sharing threads doesn't work correctly yet
-// so we need to keep the Spawning engine alive.  Once this issue is fixed we can remove s_spawner.
-static FlutterEngine* s_spawner;
-
 - (FlutterEngine*)engineForTest:(NSString*)scenarioIdentifier {
   if ([scenarioIdentifier isEqualToString:@"spawn_engine_works"]) {
-    if (s_spawner == nil) {
-      s_spawner = [[FlutterEngine alloc] initWithName:@"FlutterControllerTest" project:nil];
-      [s_spawner run];
-    }
-    return [s_spawner spawnWithEntrypoint:nil libraryURI:nil];
+    FlutterEngine* spawner = [[FlutterEngine alloc] initWithName:@"FlutterControllerTest"
+                                                         project:nil];
+    [spawner run];
+    return [spawner spawnWithEntrypoint:nil libraryURI:nil];
   } else {
     FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"FlutterControllerTest"
                                                         project:nil];

diff --git a/testing/scenario_app/run_ios_tests.sh b/testing/scenario_app/run_ios_tests.sh
@@ -36,6 +36,6 @@ fi
 cd ios/Scenarios
 set -o pipefail && xcodebuild -sdk iphonesimulator \
   -scheme Scenarios \
-  -destination 'platform=iOS Simulator,name=iPhone 8' \
+  -destination 'platform=iOS Simulator,OS=13.0,name=iPhone 8' \
   test \
   FLUTTER_ENGINE="$FLUTTER_ENGINE"