Skip to content

Commit 609b8f3

Browse files
authored
Revert part of "Terminate simulator app on "q" (#113581)" (#114083)
1 parent 5d93894 commit 609b8f3

File tree

3 files changed

+3
-39
lines changed

3 files changed

+3
-39
lines changed

dev/devicelab/bin/tasks/hot_mode_dev_cycle_ios_simulator.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Future<void> main() async {
1616
await testWithNewIOSSimulator('TestHotReloadSim', (String deviceId) async {
1717
simulatorDeviceId = deviceId;
1818
// This isn't actually a benchmark test, so do not use the returned `benchmarkScoreKeys` result.
19-
await createHotModeTest(deviceIdOverride: deviceId, checkAppRunningOnLocalDevice: true)();
19+
await createHotModeTest(deviceIdOverride: deviceId)();
2020
});
2121
} finally {
2222
await removeIOSimulator(simulatorDeviceId);

packages/flutter_tools/lib/src/ios/simulators.dart

+2-20
Original file line numberDiff line numberDiff line change
@@ -257,25 +257,6 @@ class SimControl {
257257
return result;
258258
}
259259

260-
Future<RunResult> stopApp(String deviceId, String appIdentifier) async {
261-
RunResult result;
262-
try {
263-
result = await _processUtils.run(
264-
<String>[
265-
..._xcode.xcrunCommand(),
266-
'simctl',
267-
'terminate',
268-
deviceId,
269-
appIdentifier,
270-
],
271-
throwOnError: true,
272-
);
273-
} on ProcessException catch (exception) {
274-
throwToolExit('Unable to terminate $appIdentifier on $deviceId:\n$exception');
275-
}
276-
return result;
277-
}
278-
279260
Future<void> takeScreenshot(String deviceId, String outputPath) async {
280261
try {
281262
await _processUtils.run(
@@ -555,7 +536,8 @@ class IOSSimulator extends Device {
555536
ApplicationPackage app, {
556537
String? userIdentifier,
557538
}) async {
558-
return (await _simControl.stopApp(id, app.id)).exitCode == 0;
539+
// Currently we don't have a way to stop an app running on iOS.
540+
return false;
559541
}
560542

561543
String get logFilePath {

packages/flutter_tools/test/general.shard/ios/simulators_test.dart

-18
Original file line numberDiff line numberDiff line change
@@ -901,24 +901,6 @@ Dec 20 17:04:32 md32-11-vm1 Another App[88374]: Ignore this text'''
901901
throwsToolExit(message: r'Unable to launch'),
902902
);
903903
});
904-
905-
testWithoutContext('.stopApp() handles exceptions', () async {
906-
fakeProcessManager.addCommand(const FakeCommand(
907-
command: <String>[
908-
'xcrun',
909-
'simctl',
910-
'terminate',
911-
deviceId,
912-
appId,
913-
],
914-
exception: ProcessException('xcrun', <String>[]),
915-
));
916-
917-
expect(
918-
() async => simControl.stopApp(deviceId, appId),
919-
throwsToolExit(message: r'Unable to terminate'),
920-
);
921-
});
922904
});
923905

924906
group('startApp', () {

0 commit comments

Comments
 (0)