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

Merge pull request #2354 from yjbanov/wait-for-pause-on-start

Browse Source 
[driver] wait for the isolate to enter pause on start
This commit is contained in:
Yegor 2016-03-02 17:11:53 -08:00
commit cde2e1017e
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/flutter_driver/lib/src/driver.dart
View File

@ -43,7 +43,21 @@ class FlutterDriver {
VMServiceClient client = await vmServiceConnectFunction(dartVmServiceUrl); VMServiceClient client = await vmServiceConnectFunction(dartVmServiceUrl);
VM vm = await client.getVM(); VM vm = await client.getVM();
_log.trace('Looking for the isolate'); _log.trace('Looking for the isolate');
VMIsolate isolate = await vm.isolates.first.load(); VMIsolate isolate = await vm.isolates.first.loadRunnable();
// TODO(yjbanov): for a very brief moment the isolate could report that it
// is resumed, right before it goes into "paused on start" state. There's no
// robust way to deal with it other than waiting and querying for the
// isolate data again. 300 millis should be sufficient as the isolate is in
// the runnable state (i.e. it loaded and parsed all the Dart code) and
// going from here to the `main()` method should be trivial.
//
// See: https://github.com/dart-lang/sdk/issues/25902
if (isolate.pauseEvent is VMResumeEvent) {
await new Future.delayed(new Duration(milliseconds: 300));
isolate = await vm.isolates.first.loadRunnable();
}
FlutterDriver driver = new FlutterDriver.connectedTo(client, isolate); FlutterDriver driver = new FlutterDriver.connectedTo(client, isolate);
// Attempts to resume the isolate, but does not crash if it fails because // Attempts to resume the isolate, but does not crash if it fails because

2
packages/flutter_driver/test/flutter_driver_test.dart
View File

@ -33,7 +33,7 @@ main() {
mockIsolate = new MockIsolate(); mockIsolate = new MockIsolate();
when(mockClient.getVM()).thenReturn(mockVM); when(mockClient.getVM()).thenReturn(mockVM);
when(mockVM.isolates).thenReturn([mockIsolate]); when(mockVM.isolates).thenReturn([mockIsolate]);
when(mockIsolate.load()).thenReturn(mockIsolate); when(mockIsolate.loadRunnable()).thenReturn(mockIsolate);
when(mockIsolate.invokeExtension(any, any)) when(mockIsolate.invokeExtension(any, any))
.thenReturn(new Future.value({'status': 'ok'})); .thenReturn(new Future.value({'status': 'ok'}));
vmServiceConnectFunction = (_) => new Future.value(mockClient); vmServiceConnectFunction = (_) => new Future.value(mockClient);