Merge pull request #720 from dart-lang/load-suite-timeout
Fix load suite timeout weirdness
diff --git a/lib/src/runner/browser/browser_manager.dart b/lib/src/runner/browser/browser_manager.dart
index 9f9e3c9..3472325 100644
--- a/lib/src/runner/browser/browser_manager.dart
+++ b/lib/src/runner/browser/browser_manager.dart
@@ -188,7 +188,7 @@
}));
_environment = _loadBrowserEnvironment();
- _channel.stream.listen(_onMessage, onDone: close);
+ _channel.stream.listen((message) => _onMessage(message), onDone: close);
}
/// Loads [_BrowserEnvironment].
diff --git a/lib/src/runner/configuration/load.dart b/lib/src/runner/configuration/load.dart
index cd9acf9..eee575f 100644
--- a/lib/src/runner/configuration/load.dart
+++ b/lib/src/runner/configuration/load.dart
@@ -286,7 +286,8 @@
var paths = _getList("paths", (pathNode) {
_validate(pathNode, "Paths must be strings.", (value) => value is String);
- _validate(pathNode, "Paths must be relative.", p.url.isRelative);
+ _validate(pathNode, "Paths must be relative.",
+ (value) => p.url.isRelative(value));
return _parseNode(pathNode, "path", p.fromUri);
});
diff --git a/lib/src/runner/loader.dart b/lib/src/runner/loader.dart
index 5f0e8ae..31b1a99 100644
--- a/lib/src/runner/loader.dart
+++ b/lib/src/runner/loader.dart
@@ -15,7 +15,6 @@
import '../backend/invoker.dart';
import '../backend/test_platform.dart';
import '../util/io.dart';
-import '../utils.dart';
import 'browser/platform.dart';
import 'configuration.dart';
import 'configuration/suite.dart';
diff --git a/test/frontend/add_tear_down_test.dart b/test/frontend/add_tear_down_test.dart
index 3a63ff8..c638b7d 100644
--- a/test/frontend/add_tear_down_test.dart
+++ b/test/frontend/add_tear_down_test.dart
@@ -7,8 +7,6 @@
import 'package:async/async.dart';
import 'package:test/test.dart';
-import 'package:test/src/backend/declarer.dart';
-
import '../utils.dart';
void main() {
