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

Unified Diff: lib/src/runner/browser/firefox.dart

Issue 1091883002: More gracefully handle browser errors. (Closed) Base URL: git@github.com:dart-lang/test@master
Patch Set: merge Created 5 years, 8 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
« no previous file with comments | « lib/src/runner/browser/dartium.dart ('k') | lib/src/runner/browser/phantom_js.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/src/runner/browser/firefox.dart
diff --git a/lib/src/runner/browser/firefox.dart b/lib/src/runner/browser/firefox.dart
index 215f3a85885d77cbe0cf621dc670c6b051d21c98..36eed533adbe14817651f3381a90cfbe6ddbb00c 100644
--- a/lib/src/runner/browser/firefox.dart
+++ b/lib/src/runner/browser/firefox.dart
@@ -5,11 +5,15 @@
library test.runner.browser.firefox;
import 'dart:async';
+import 'dart:convert';
import 'dart:io';
import 'package:path/path.dart' as p;
+import 'package:stack_trace/stack_trace.dart';
import '../../util/io.dart';
+import '../../utils.dart';
+import '../application_exception.dart';
import 'browser.dart';
final _preferences = '''
@@ -29,12 +33,6 @@ class Firefox implements Browser {
/// The underlying process.
Process _process;
- /// The temporary directory used as the browser's user data dir.
- ///
- /// A new data dir is created for each run to ensure that they're
- /// well-isolated.
- String _dir;
-
Future get onExit => _onExitCompleter.future;
final _onExitCompleter = new Completer();
@@ -56,13 +54,11 @@ class Firefox implements Browser {
// for the process to actually start. They should just wait for the HTTP
// request instead.
withTempDir((dir) {
- _dir = dir;
-
new File(p.join(dir, 'prefs.js')).writeAsStringSync(_preferences);
return Process.start(executable, [
"--profile",
- "$_dir",
+ "$dir",
url.toString(),
"--no-remote"
], environment: {
@@ -76,9 +72,19 @@ class Firefox implements Browser {
return _process.exitCode;
});
}).then((exitCode) {
- if (exitCode != 0) throw "Firefox failed with exit code $exitCode.";
- }).then(_onExitCompleter.complete)
- .catchError(_onExitCompleter.completeError);
+ if (exitCode == 0) return null;
+
+ return UTF8.decodeStream(_process.stderr).then((error) {
+ throw new ApplicationException(
+ "Firefox failed with exit code $exitCode:\n$error");
+ });
+ }).then(_onExitCompleter.complete).catchError((error, stackTrace) {
+ if (stackTrace == null) stackTrace = new Trace.current();
+ _onExitCompleter.completeError(
+ new ApplicationException(
+ "Failed to start Firefox: ${getErrorMessage(error)}."),
+ stackTrace);
+ });
}
Future close() {
« no previous file with comments | « lib/src/runner/browser/dartium.dart ('k') | lib/src/runner/browser/phantom_js.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698