Use the new test runner.

test/serve/utils.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS d.file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library pub_tests;
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
@@ skipping 143 matching lines @@
   var pubArgs = [
     "serve",
     "--port=0", // Use port 0 to get an ephemeral port.
     "--force-poll",
     "--admin-port=0", // Use port 0 to get an ephemeral port.
     "--log-admin-url"
   ];
 
   if (args != null) pubArgs.addAll(args);
 
-  // Dart2js can take a long time to compile dart code, so we increase the
-  // timeout to cope with that.
-  currentSchedule.timeout *= 1.5;
-
   if (createWebDir) d.dir(appPath, [d.dir("web")]).create();
   return startPub(args: pubArgs);
 }
 
 /// Schedules starting the "pub serve" process and records its port number for
 /// future requests.
 ///
 /// If [shouldGetFirst] is `true`, validates that pub get is run first.
 ///
 /// If [createWebDir] is `true`, creates a `web/` directory if one doesn't exist
@@ skipping 186 matching lines @@
 /// It returns the response as a [Future].
 Future<Map> webSocketRequest(String method, [Map params]) {
   var completer = new Completer();
   schedule(() {
     return Future.wait([
       _ensureWebSocket(),
       awaitObject(params),
     ]).then((results) {
       var resolvedParams = results[1];
       chainToCompleter(
-          currentSchedule.wrapFuture(_jsonRpcRequest(method, resolvedParams)),
+          _jsonRpcRequest(method, resolvedParams),
           completer);
     });
   }, "send $method with $params to web socket");
   return completer.future;
 }
 
 /// Sends a JSON RPC 2.0 request to the running pub serve's web socket
 /// connection, waits for a reply, then verifies the result.
 ///
 /// This calls a method named [method] with the given [params]. [params] may
@@ skipping 108 matching lines @@
 /// included. Unlike [getServerUrl], this should only be called after the ports
 /// are known.
 String _getServerUrlSync([String root, String path]) {
   if (root == null) root = 'web';
   expect(_ports, contains(root));
   var url = "http://localhost:${_ports[root]}";
   if (path != null) url = "$url/$path";
   return url;
 }