Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1346)

Unified Diff: tools/testing/dart/test_runner.dart

Issue 11017022: Revert r13286 "Fix issues with test.dart that appeared on Mac." (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tools/testing/dart/test_runner.dart
===================================================================
--- tools/testing/dart/test_runner.dart (revision 13378)
+++ tools/testing/dart/test_runner.dart (working copy)
@@ -754,7 +754,19 @@
_process.close();
completer.complete(true);
};
- _process.kill();
+ if (_isWebDriver && Platform.operatingSystem == 'windows') {
+ // Use a graceful shutdown so our Selenium script can close
+ // the open browser processes. TODO(jmesserly): Send a signal once
+ // that's supported in Windows.
+ _process.stdin.write('--terminate\n'.charCodes());
+
+ // In case the run_selenium process didn't close, kill it after 30s
+ int shutdownMillisecs = 30000;
+ new Timer(shutdownMillisecs, (e) { if (!closed) _process.kill(); });
Mads Ager (google) 2012/10/09 06:16:57 Please don't do this. If you add a 30 sec timeout
+ } else {
+ _process.kill();
+ }
+
return completer.future;
}
« tools/testing/dart/test_progress.dart ('K') | « tools/testing/dart/test_progress.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698