Drain HTTP request input streams before responding.

utils/tests/pub/pub_lish_test.dart

 // Copyright (c) 2012, 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.
 
 library pub_lish_test;
 
 import 'dart:io';
 import 'dart:json' as json;
 
 import 'test_pub.dart';
@@ skipping 20 matching lines @@
       response.outputStream.writeString(json.stringify(body));
       response.outputStream.close();
     });
   });
 }
 
 void handleUpload(ScheduledServer server) {
   server.handle('POST', '/upload', (request, response) {
     // TODO(nweiz): Once a multipart/form-data parser in Dart exists, validate
     // that the request body is correctly formatted. See issue 6952.
-    return server.url.then((url) {
+    return drainInputStream(request.inputStream).then((_) {
+      return server.url;

[nweiz, 2013/02/06 20:47:05]

Style nit: I'd probably make this a "=>"-style lambda.

[Bob Nystrom, 2013/02/06 20:50:40]

I did that first, but then the following then() doesn't have a convenient place
to go. I figured this looked marginally better than a hanging ".then()" on its
own line.

+    }).then((url) {
       response.statusCode = 302;
       response.headers.set('location', url.resolve('/create').toString());
       response.outputStream.close();
     });
   });
 }
 
 main() {
   initConfig();
   setUp(() => normalPackage.scheduleCreate());
@@ skipping 201 matching lines @@
 
   integration('cloud storage upload provides an error', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
 
     confirmPublish(pub);
     handleUploadForm(server);
 
     server.handle('POST', '/upload', (request, response) {
-      response.statusCode = 400;
-      response.headers.contentType = new ContentType('application', 'xml');
-      response.outputStream.writeString('<Error><Message>Your request sucked.'
-          '</Message></Error>');
-      response.outputStream.close();
+      return drainInputStream(request.inputStream).then((_) {
+        response.statusCode = 400;
+        response.headers.contentType = new ContentType('application', 'xml');
+        response.outputStream.writeString('<Error><Message>Your request sucked.'
+            '</Message></Error>');
+        response.outputStream.close();
+      });
     });
 
     // TODO(nweiz): This should use the server's error message once the client
     // can parse the XML.
     expectLater(pub.nextErrLine(), equals('Failed to upload the package.'));
     pub.shouldExit(1);
   });
 
   integration("cloud storage upload doesn't redirect", () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
 
     confirmPublish(pub);
     handleUploadForm(server);
 
     server.handle('POST', '/upload', (request, response) {
-      // don't set the location header
-      response.outputStream.close();
+      return drainInputStream(request.inputStream).then((_) {
+        // Don't set the location header.
+        response.outputStream.close();
+      });
     });
 
     expectLater(pub.nextErrLine(), equals('Failed to upload the package.'));
     pub.shouldExit(1);
   });
 
   integration('package creation provides an error', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
@@ skipping 67 matching lines @@
     server.handle('GET', '/create', (request, response) {
       response.outputStream.writeString(json.stringify(body));
       response.outputStream.close();
     });
 
     expectLater(pub.nextErrLine(), equals('Invalid server response:'));
     expectLater(pub.nextErrLine(), equals(json.stringify(body)));
     pub.shouldExit(1);
   });
 }