firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cancel timeout when waiting for driver extension (#9354)

Browse Source
This commit is contained in:
Yegor
2017-04-13 10:04:08 -07:00
committed by GitHub
parent ecdfe65828
commit 75dc033613
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -217,16 +217,15 @@ class FlutterDriver {
// option, then the VM service extension is not registered yet. Wait for
// it to be registered.
final Future<dynamic> whenResumed = resumeLeniently();
final Future<dynamic> whenServiceExtensionReady = Future.any<dynamic>(<Future<dynamic>>[
waitForServiceExtension(),
final Future<dynamic> whenServiceExtensionReady = waitForServiceExtension();
await whenResumed;
try {
_log.trace('Waiting for service extension');
// We will never receive the extension event if the user does not
// register it. If that happens time out.
new Future<String>.delayed(_kLongTimeout * 2, () => 'timeout')
]);
await whenResumed;
_log.trace('Waiting for service extension');
final dynamic signal = await whenServiceExtensionReady;
if (signal == 'timeout') {
await whenServiceExtensionReady.timeout(_kLongTimeout * 2);
} on TimeoutException catch (_) {
throw new DriverError(
'Timed out waiting for Flutter Driver extension to become available. '
'Ensure your test app (often: lib/main.dart) imports '