firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Xcode instruments for devicelab device lookup (#10840)

Browse Source 
Replace use of ideviceinfo in devicelab tests with Xcode instruments
lookup.
This commit is contained in:
Chris Bracken 2017-06-19 14:44:42 -07:00 committed by GitHub
parent 400a62d121
commit 58fe8237d2
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dev/devicelab/lib/framework/adb.dart
View File

@ -306,16 +306,31 @@ class IosDeviceDiscovery implements DeviceDiscovery {
_workingDevice = allDevices[new math.Random().nextInt(allDevices.length)]; _workingDevice = allDevices[new math.Random().nextInt(allDevices.length)];
} }
// Physical device line format to be matched:
// My iPhone (10.3.2) [75b90e947c5f429fa67f3e9169fda0d89f0492f1]
//
// Other formats in output (desktop, simulator) to be ignored:
// my-mac-pro [2C10513E-4dA5-405C-8EF5-C44353DB3ADD]
// iPhone 6s (9.3) [F6CEE7CF-81EB-4448-81B4-1755288C7C11] (Simulator)
static final RegExp _deviceRegex = new RegExp(r'^.* +\(.*\) +\[(.*)\]$');
@override @override
Future<List<String>> discoverDevices() async { Future<List<String>> discoverDevices() async {
// TODO: use the -k UniqueDeviceID option, which requires much less parsing. final List<String> iosDeviceIDs = <String>[];
final List<String> iosDeviceIds = grep('UniqueDeviceID', from: await eval('ideviceinfo', <String>[])) final Iterable<String> deviceLines = (await eval('instruments', <String>['-s', 'devices']))
.map((String line) => line.split(' ').last).toList(); .split('\n')
.map((String line) => line.trim());
if (iosDeviceIds.isEmpty) for (String line in deviceLines) {
final Match match = _deviceRegex.firstMatch(line);
if (match != null) {
final String deviceID = match.group(1);
iosDeviceIDs.add(deviceID);
}
}
if (iosDeviceIDs.isEmpty)
throw 'No connected iOS devices found.'; throw 'No connected iOS devices found.';
return iosDeviceIds; return iosDeviceIDs;
} }
@override @override