Revert "Stop working around issue 6984."

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';
 
 import 'test_pub.dart';
 import '../../../pkg/unittest/lib/unittest.dart';
 import '../../pub/io.dart';
 
 void handleUploadForm(ScheduledServer server, [Map body]) {
   server.handle('GET', '/packages/versions/new.json', (request, response) {
-    return server.url.transform((url) {
+    return server.url.chain((url) {
       expect(request.headers.value('authorization'),
           equals('Bearer access token'));
 
       if (body == null) {
         body = {
           'url': url.resolve('/upload').toString(),
           'fields': {
             'field1': 'value1',
             'field2': 'value2'
           }
         };
       }
 
       response.headers.contentType = new ContentType("application", "json");
       response.outputStream.writeString(JSON.stringify(body));
-      response.outputStream.close();
+      return closeHttpResponse(request, response);
     });
   });
 }
 
 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.transform((url) {
+    return server.url.chain((url) {
       response.statusCode = 302;
       response.headers.set('location', url.resolve('/create').toString());
-      response.outputStream.close();
+      return closeHttpResponse(request, response);
     });
   });
 }
 
 main() {
   setUp(() => dir(appPath, [libPubspec("test_pkg", "1.0.0")]).scheduleCreate());
 
   test('archives and uploads a package', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
     handleUploadForm(server);
     handleUpload(server);
 
     server.handle('GET', '/create', (request, response) {
       response.outputStream.writeString(JSON.stringify({
         'success': {'message': 'Package test_pkg 1.0.0 uploaded!'}
       }));
-      response.outputStream.close();
+      return closeHttpResponse(request, response);
     });
 
     expectLater(pub.nextLine(), equals('Package test_pkg 1.0.0 uploaded!'));
     pub.shouldExit(0);
 
     run();
   });
 
   // TODO(nweiz): Once a multipart/form-data parser in Dart exists, we should
   // test that "pub lish" chooses the correct files to publish.
 
   test('credentials are invalid', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
 
     server.handle('GET', '/packages/versions/new.json', (request, response) {
       response.statusCode = 401;
       response.headers.set('www-authenticate', 'Bearer error="invalid_token",'
           ' error_description="your token sucks"');
       response.outputStream.writeString(JSON.stringify({
         'error': {'message': 'your token sucks'}
       }));
-      response.outputStream.close();
+      return closeHttpResponse(request, response);
     });
 
     expectLater(pub.nextErrLine(), equals('OAuth2 authorization failed (your '
         'token sucks).'));
     expectLater(pub.nextLine(), equals('Pub needs your authorization to upload '
         'packages on your behalf.'));
     pub.kill();
 
     run();
   });
@@ skipping 40 matching lines @@
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
     pub.writeLine("y");
     handleUploadForm(server);
     handleUpload(server);
 
     server.handle('GET', '/create', (request, response) {
       response.outputStream.writeString(JSON.stringify({
         'success': {'message': 'Package test_pkg 1.0.0 uploaded!'}
       }));
-      response.outputStream.close();
+      return closeHttpResponse(request, response);
     });
 
     pub.shouldExit(0);
     expectLater(pub.remainingStdout(),
         contains('Package test_pkg 1.0.0 uploaded!'));
 
     run();
   });
 
   test('upload form provides an error', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
 
     server.handle('GET', '/packages/versions/new.json', (request, response) {
       response.statusCode = 400;
       response.outputStream.writeString(JSON.stringify({
         'error': {'message': 'your request sucked'}
       }));
-      response.outputStream.close();
+      return closeHttpResponse(request, response);
     });
 
     expectLater(pub.nextErrLine(), equals('your request sucked'));
     pub.shouldExit(1);
 
     run();
   });
 
   test('upload form provides invalid JSON', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
 
     server.handle('GET', '/packages/versions/new.json', (request, response) {
       response.outputStream.writeString('{not json');
-      response.outputStream.close();
+      return closeHttpResponse(request, response);
     });
 
     expectLater(pub.nextErrLine(), equals('Invalid server response:'));
     expectLater(pub.nextErrLine(), equals('{not json'));
     pub.shouldExit(1);
 
     run();
   });
 
   test('upload form is missing url', () {
@@ skipping 112 matching lines @@
   });
 
   test("cloud storage upload doesn't redirect", () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
     handleUploadForm(server);
 
     server.handle('POST', '/upload', (request, response) {
       // don't set the location header
-      response.outputStream.close();
+      return closeHttpResponse(request, response);
     });
 
     expectLater(pub.nextErrLine(), equals('Failed to upload the package.'));
     pub.shouldExit(1);
 
     run();
   });
 
   test('package creation provides an error', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
     handleUploadForm(server);
     handleUpload(server);
 
     server.handle('GET', '/create', (request, response) {
       response.statusCode = 400;
       response.outputStream.writeString(JSON.stringify({
         'error': {'message': 'Your package was too boring.'}
       }));
-      response.outputStream.close();
+      return closeHttpResponse(request, response);
     });
 
     expectLater(pub.nextErrLine(), equals('Your package was too boring.'));
     pub.shouldExit(1);
 
     run();
   });
 
   test('package creation provides invalid JSON', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
     handleUploadForm(server);
     handleUpload(server);
 
     server.handle('GET', '/create', (request, response) {
       response.outputStream.writeString('{not json');
-      response.outputStream.close();
+      return closeHttpResponse(request, response);
     });
 
     expectLater(pub.nextErrLine(), equals('Invalid server response:'));
     expectLater(pub.nextErrLine(), equals('{not json'));
     pub.shouldExit(1);
 
     run();
   });
 
   test('package creation provides a malformed error', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
     handleUploadForm(server);
     handleUpload(server);
 
     var body = {'error': 'Your package was too boring.'};
     server.handle('GET', '/create', (request, response) {
       response.statusCode = 400;
       response.outputStream.writeString(JSON.stringify(body));
-      response.outputStream.close();
+      return closeHttpResponse(request, response);
     });
 
     expectLater(pub.nextErrLine(), equals('Invalid server response:'));
     expectLater(pub.nextErrLine(), equals(JSON.stringify(body)));
     pub.shouldExit(1);
 
     run();
   });
 
   test('package creation provides a malformed success', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
     handleUploadForm(server);
     handleUpload(server);
 
     var body = {'success': 'Your package was awesome.'};
     server.handle('GET', '/create', (request, response) {
       response.outputStream.writeString(JSON.stringify(body));
-      response.outputStream.close();
+      return closeHttpResponse(request, response);
     });
 
     expectLater(pub.nextErrLine(), equals('Invalid server response:'));
     expectLater(pub.nextErrLine(), equals(JSON.stringify(body)));
     pub.shouldExit(1);
 
     run();
   });
 }