Use shelf for some of pub's servers.

sdk/lib/_internal/pub/test/test_pub.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS 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.
 
 /// Test infrastructure for testing pub. Unlike typical unit tests, most pub
 /// tests are integration tests that stage some stuff on the file system, run
 /// pub, and then validate the results. This library provides an API to build
 /// tests like that.
 library test_pub;
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:math';
 
 import 'package:http/testing.dart';
 import 'package:path/path.dart' as path;
 import 'package:scheduled_test/scheduled_process.dart';
 import 'package:scheduled_test/scheduled_server.dart';
 import 'package:scheduled_test/scheduled_stream.dart';
 import 'package:scheduled_test/scheduled_test.dart';
+import 'package:shelf/shelf.dart' as shelf;
+import 'package:shelf/shelf_io.dart' as shelf_io;
 import 'package:unittest/compact_vm_config.dart';
 import 'package:yaml/yaml.dart';
 
 import '../lib/src/entrypoint.dart';
 import '../lib/src/exit_codes.dart' as exit_codes;
 // TODO(rnystrom): Using "gitlib" as the prefix here is ugly, but "git" collides
 // with the git descriptor method. Maybe we should try to clean up the top level
 // scope a bit?
 import '../lib/src/git.dart' as gitlib;
 import '../lib/src/http.dart';
@@ skipping 65 matching lines @@
 /// exist only for the duration of the pub run.
 ///
 /// Subsequent calls to [serve] will replace the previous server.
 void serve([List<d.Descriptor> contents]) {
   var baseDir = d.dir("serve-dir", contents);
 
   _hasServer = true;
 
   schedule(() {
     return _closeServer().then((_) {
-      return HttpServer.bind("127.0.0.1", 0).then((server) {
+      return shelf_io.serve((request) {
+        currentSchedule.heartbeat();
+        var path = request.pathInfo.replaceFirst("/", "");
+        _requestedPaths.add(path);
+
+        return validateStream(baseDir.load(path))
+            .then((stream) => new shelf.Response.ok(stream))
+            .catchError((error) {
+          return new shelf.Response.notFound('File "$path" not found.');
+        });
+      }, '127.0.0.1', 0).then((server) {
         _server = server;
-        server.listen((request) {
-          currentSchedule.heartbeat();
-          var response = request.response;
-          try {
-            var path = request.uri.path.replaceFirst("/", "");
-            _requestedPaths.add(path);
-
-            response.persistentConnection = false;
-            var stream = baseDir.load(path);
-
-            new ByteStream(stream).toBytes().then((data) {
-              currentSchedule.heartbeat();
-              response.statusCode = 200;
-              response.contentLength = data.length;
-              response.add(data);
-              response.close();
-            }).catchError((e) {
-              response.statusCode = 404;
-              response.contentLength = 0;
-              response.close();
-            });
-          } catch (e) {
-            currentSchedule.signalError(e);
-            response.statusCode = 500;
-            response.close();
-            return;
-          }
-        });
         _portCompleter.complete(_server.port);
         currentSchedule.onComplete.schedule(_closeServer);
-        return null;
       });
     });
   }, 'starting a server serving:\n${baseDir.describe()}');
 }
 
 /// Closes [_server]. Returns a [Future] that will complete after the [_server]
 /// is closed.
 Future _closeServer() {
   if (_server == null) return new Future.value();
   var future = _server.close();
@@ skipping 718 matching lines @@
         _lastMatcher.matches(item.last, matchState);
   }
 
   Description describe(Description description) {
     return description.addAll("(", ", ", ")", [_firstMatcher, _lastMatcher]);
   }
 }
 
 /// A [StreamMatcher] that matches multiple lines of output.
 StreamMatcher emitsLines(String output) => inOrder(output.split("\n"));