DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Prevent hangs due to bad import/export directives (#5538)

Browse Source 
If the input test script contains a bad import, sky_shell will fail to
execute main(), in which case a connection to /runner is never
established and the _ServerInfo.socket never completes.

This change works around this by issuing a request on /shutdown when
sky_shell exits.
This commit is contained in:
Chris Bracken 2016-08-22 15:30:10 -07:00 committed by GitHub
parent 74446d78fc
commit bfbbef108d
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/flutter_tools/lib/src/test/flutter_platform.dart
View File

@ -21,7 +21,8 @@ import 'coverage_collector.dart';
final String _kSkyShell = Platform.environment['SKY_SHELL'];
const String _kHost = '127.0.0.1';
const String _kPath = '/runner';
const String _kRunnerPath = '/runner';
const String _kShutdownPath = '/shutdown';
String shellPath;
@ -33,20 +34,24 @@ void installHook() {
class _ServerInfo {
final String url;
final String shutdownUrl;
final Future<WebSocket> socket;
final HttpServer server;
_ServerInfo(this.server, this.url, this.socket);
_ServerInfo(this.server, this.url, this.shutdownUrl, this.socket);
}
Future<_ServerInfo> _startServer() async {
HttpServer server = await HttpServer.bind(_kHost, 0);
Completer<WebSocket> socket = new Completer<WebSocket>();
server.listen((HttpRequest request) {
if (request.uri.path == _kPath)
if (request.uri.path == _kRunnerPath)
socket.complete(WebSocketTransformer.upgrade(request));
else if (!socket.isCompleted && request.uri.path == _kShutdownPath)
socket.completeError('Failed to start test');
});
return new _ServerInfo(server, 'ws://$_kHost:${server.port}$_kPath', socket.future);
return new _ServerInfo(server, 'ws://$_kHost:${server.port}$_kRunnerPath',
'ws://$_kHost:${server.port}$_kShutdownPath', socket.future);
}
Future<Process> _startProcess(String mainPath, { String packages, int observatoryPort }) {
@ -172,6 +177,10 @@ void main() {
}
}
process.exitCode.then((_) {
WebSocket.connect(info.shutdownUrl);
});
try {
WebSocket socket = await info.socket;
StreamChannel<dynamic> channel = new StreamChannel<dynamic>(socket.map(JSON.decode), socket);