Unverified Commit 13896b3b authored by Jenn Magder's avatar Jenn Magder Committed by GitHub

Decrease device discovery timeout from 10 to 5 seconds (#69266)

parent 46b1b677
......@@ -636,7 +636,7 @@ class IosDeviceDiscovery implements DeviceDiscovery {
Future<List<String>> discoverDevices() async {
final List<dynamic> results = json.decode(await eval(
path.join(flutterDirectory.path, 'bin', 'flutter'),
<String>['devices', '--machine', '--suppress-analytics', '--device-timeout', '10'],
<String>['devices', '--machine', '--suppress-analytics', '--device-timeout', '5'],
)) as List<dynamic>;
// [
......
......@@ -434,7 +434,7 @@ Future<String> eval(
List<String> flutterCommandArgs(String command, List<String> options) {
// Commands support the --device-timeout flag.
final List<String> supportedDeviceTimeoutCommands = <String>[
final Set<String> supportedDeviceTimeoutCommands = <String>{
'attach',
'devices',
'drive',
......@@ -442,13 +442,13 @@ List<String> flutterCommandArgs(String command, List<String> options) {
'logs',
'run',
'screenshot',
];
};
return <String>[
command,
if (deviceOperatingSystem == DeviceOperatingSystem.ios && supportedDeviceTimeoutCommands.contains(command))
...<String>[
'--device-timeout',
'10',
'5',
],
if (localEngine != null) ...<String>['--local-engine', localEngine],
if (localEngineSrcPath != null) ...<String>['--local-engine-src-path', localEngineSrcPath],
......
......@@ -771,7 +771,7 @@ class PerfTestWithSkSL extends PerfTest {
'run',
if (deviceOperatingSystem == DeviceOperatingSystem.ios)
...<String>[
'--device-timeout', '10',
'--device-timeout', '5',
],
'--verbose',
'--verbose-system-logs',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment