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

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

Issue 1086213002: Support a @Timeout annotation. (Closed) Base URL: git@github.com:dart-lang/test@master
Patch Set: CHANGELOG + README 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/iframe_listener.dart ('k') | lib/src/runner/loader.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/src/runner/browser/server.dart
diff --git a/lib/src/runner/browser/server.dart b/lib/src/runner/browser/server.dart
index 963a6b84dccafbedf7d752e1f372a96db2c66ce9..ca1d64de39ce19c2209f907376818fdfcc24850d 100644
--- a/lib/src/runner/browser/server.dart
+++ b/lib/src/runner/browser/server.dart
@@ -15,6 +15,7 @@ import 'package:shelf/shelf_io.dart' as shelf_io;
import 'package:shelf_static/shelf_static.dart';
import 'package:shelf_web_socket/shelf_web_socket.dart';
+import '../../backend/metadata.dart';
import '../../backend/suite.dart';
import '../../backend/test_platform.dart';
import '../../util/io.dart';
@@ -223,7 +224,8 @@ void main() {
///
/// This will start a browser to load the suite if one isn't already running.
/// Throws an [ArgumentError] if [browser] isn't a browser platform.
- Future<Suite> loadSuite(String path, TestPlatform browser) {
+ Future<Suite> loadSuite(String path, TestPlatform browser,
+ Metadata metadata) {
if (!browser.isBrowser) {
throw new ArgumentError("$browser is not a browser.");
}
@@ -249,7 +251,7 @@ void main() {
// TODO(nweiz): Don't start the browser until all the suites are compiled.
return _browserManagerFor(browser).then((browserManager) {
if (_closed) return null;
- return browserManager.loadSuite(path, suiteUrl);
+ return browserManager.loadSuite(path, suiteUrl, metadata);
}).then((suite) {
if (_closed) return null;
if (suite != null) return suite.change(platform: browser.name);
« no previous file with comments | « lib/src/runner/browser/iframe_listener.dart ('k') | lib/src/runner/loader.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698