Use the new test runner.

test/serve/web_socket/serve_directory_test.dart

Index: test/serve/web_socket/serve_directory_test.dart
diff --git a/test/serve/web_socket/serve_directory_test.dart b/test/serve/web_socket/serve_directory_test.dart
index 148f74d79c7f96d2c20aedbbef16ab1cdb6039cf..e03cacf513b60ba9e849bd5116e2b049338cec08 100644
--- a/test/serve/web_socket/serve_directory_test.dart
+++ b/test/serve/web_socket/serve_directory_test.dart
@@ -11,7 +11,6 @@ import '../../test_pub.dart';
 import '../utils.dart';
 
 main() {
-  initConfig();
   integration("binds a directory to a new port", () {
     d.dir(appPath, [
       d.appPubspec(),
@@ -26,11 +25,13 @@ main() {
     pubServe(args: ["web"]);
 
     // Bind the new directory.
-    expectWebSocketResult("serveDirectory", {"path": "test"}, {
-      "url": matches(r"http://localhost:\d+")
-    }).then((response) {
-      var url = Uri.parse(response["url"]);
-      registerServerPort("test", url.port);
+    schedule(() {

[Bob Nystrom, 2015/06/26 23:04:10]

Use async/await?

+      return expectWebSocketResult("serveDirectory", {"path": "test"}, {
+        "url": matches(r"http://localhost:\d+")
+      }).then((response) {
+        var url = Uri.parse(response["url"]);
+        registerServerPort("test", url.port);
+      });
     });
 
     // It should be served now.