Add admin server that supports web socket API.

sdk/lib/_internal/pub/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';
 
 import 'package:http/http.dart' as http;
 import 'package:scheduled_test/scheduled_process.dart';
 import 'package:scheduled_test/scheduled_stream.dart';
 import 'package:scheduled_test/scheduled_test.dart';
 
 import '../../lib/src/utils.dart';
 import '../descriptor.dart' as d;
 import '../test_pub.dart';
 
 /// The pub process running "pub serve".
 ScheduledProcess _pubServer;
 
+/// The ephemeral port assign to the running admin server.
+int _adminPort;
+
 /// The ephemeral ports assigned to the running servers, associated with the
 /// directories they're serving.
 final _ports = new Map<String, int>();
 
 /// A completer that completes when the server has been started and the served
 /// ports are known.
 Completer _portsCompleter;
 
 /// The web socket connection to the running pub process, or `null` if no
 /// connection has been made.
@@ skipping 68 matching lines @@
 }
 
 /// Schedules starting the `pub serve` process.
 ///
 /// Unlike [pubServe], this doesn't determine the port number of the server, and
 /// so may be used to test for errors in the initialization process.
 ///
 /// Returns the `pub serve` process.
 ScheduledProcess startPubServe({Iterable<String> args,
     bool createWebDir: true}) {
-  // Use port 0 to get an ephemeral port.
-  var pubArgs = ["serve", "--port=0", "--hostname=127.0.0.1", "--force-poll"];
+  var pubArgs = [
+    "serve",
+    "--port=0", // Use port 0 to get an ephemeral port.
+    "--hostname=127.0.0.1", // Force IPv4 on bots.
+    "--force-poll",
+    "--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);
 }
@@ skipping 23 matching lines @@
     }
   });
 
   if (shouldGetFirst) {
     _pubServer.stdout.expect(consumeThrough("Got dependencies!"));
   }
 
   _pubServer.stdout.expect(startsWith("Loading source assets..."));
   _pubServer.stdout.expect(consumeWhile(matches("Loading .* transformers...")));
 
+  _pubServer.stdout.expect(predicate(_parseAdminPort));
+
   // The server should emit one or more ports.
   _pubServer.stdout.expect(
       consumeWhile(predicate(_parsePort, 'emits server url')));
   schedule(() {
     expect(_ports, isNot(isEmpty));
     _portsCompleter.complete();
   });
 
   return _pubServer;
 }
 
 /// The regular expression for parsing pub's output line describing the URL for
 /// the server.
 final _parsePortRegExp = new RegExp(r"([^ ]+) +on http://127\.0\.0\.1:(\d+)");
 
+/// Parses the port number from the "Running admin server on 127.0.0.1:1234"
+/// line printed by pub serve.
+bool _parseAdminPort(String line) {
+  var match = _parsePortRegExp.firstMatch(line);
+  if (match == null) return false;
+  _adminPort = int.parse(match[2]);
+  return true;
+}
+
 /// Parses the port number from the "Serving blah on 127.0.0.1:1234" line
 /// printed by pub serve.
 bool _parsePort(String line) {
   var match = _parsePortRegExp.firstMatch(line);
   if (match == null) return false;
   _ports[match[1]] = int.parse(match[2]);
   return true;
 }
 
 void endPubServe() {
@@ skipping 78 matching lines @@
   _pubServer.stdout.expect(consumeThrough(contains("successfully")));
 
 /// Schedules opening a web socket connection to the currently running pub
 /// serve.
 Future _ensureWebSocket() {
   // Use the existing one if already connected.
   if (_webSocket != null) return new Future.value();
 
   // Server should already be running.
   expect(_pubServer, isNotNull);
-  expect(_ports, isNot(isEmpty));
+  expect(_adminPort, isNotNull);
 
-  // TODO(nweiz): once we have a separate port for a web interface into the
-  // server, use that port for the websocket interface.
-  var port = _ports.values.first;
-  return WebSocket.connect("ws://127.0.0.1:$port").then((socket) {
+  return WebSocket.connect("ws://127.0.0.1:$_adminPort").then((socket) {
     _webSocket = socket;
     // TODO(rnystrom): Works around #13913.
     _webSocketBroadcastStream = _webSocket.asBroadcastStream();
   });
 }
 
 /// Sends [request] (an arbitrary JSON object) to the running pub serve's web
 /// socket connection, waits for a reply, then verifies that the reply is
 /// either equal to [replyEquals] or matches [replyMatches].
 ///
@@ skipping 56 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://127.0.0.1:${_ports[root]}";
   if (path != null) url = "$url/$path";
   return url;
 }