Revert "Stop working around issue 6984."

utils/tests/pub/oauth2_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 oauth2_test;
 
 import 'dart:io';
 import 'dart:json';
 import 'dart:uri';
 
 import 'test_pub.dart';
 import '../../../pkg/http/lib/http.dart' as http;
 import '../../../pkg/unittest/lib/unittest.dart';
 import '../../pub/io.dart';
 import '../../pub/utils.dart';
 
 main() {
   setUp(() => dir(appPath, [libPubspec("test_pkg", "1.0.0")]).scheduleCreate());
 
   test('with no credentials.json, authenticates and saves credentials.json',
       () {
     var server = new ScheduledServer();
     var pub = startPubLish(server);
     authorizePub(pub, server);
 
     server.handle('GET', '/packages/versions/new.json', (request, response) {
       expect(request.headers.value('authorization'),
           equals('Bearer access token'));
 
-      response.outputStream.close();
+      return closeHttpResponse(request, response);
     });
 
     pub.kill();
 
     credentialsFile(server, 'access token').scheduleValidate();
 
     run();
   });
 
   test('with a pre-existing credentials.json does not authenticate', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
 
     server.handle('GET', '/packages/versions/new.json', (request, response) {
       expect(request.headers.value('authorization'),
           equals('Bearer access token'));
 
-      response.outputStream.close();
+      return closeHttpResponse(request, response);
     });
 
     pub.kill();
 
     run();
   });
 
   test('with an expired credentials.json, refreshes and saves the refreshed '
       'access token to credentials.json', () {
     var server = new ScheduledServer();
@@ skipping 16 matching lines @@
           "token_type": "bearer"
         }));
         response.outputStream.close();
       });
     });
 
     server.handle('GET', '/packages/versions/new.json', (request, response) {
       expect(request.headers.value('authorization'),
           equals('Bearer new access token'));
 
-      response.outputStream.close();
+      return closeHttpResponse(request, response);
     });
 
     pub.shouldExit();
 
     credentialsFile(server, 'new access token', refreshToken: 'refresh token')
         .scheduleValidate();
 
     run();
   });
 
   test('with an expired credentials.json without a refresh token, '
        'authenticates again and saves credentials.json', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token',
         expiration: new Date.now().subtract(new Duration(hours: 1)))
         .scheduleCreate();
 
     var pub = startPubLish(server);
 
     expectLater(pub.nextErrLine(), equals("Pub's authorization to upload "
           "packages has expired and can't be automatically refreshed."));
     authorizePub(pub, server, "new access token");
 
     server.handle('GET', '/packages/versions/new.json', (request, response) {
       expect(request.headers.value('authorization'),
           equals('Bearer new access token'));
 
-      response.outputStream.close();
+      return closeHttpResponse(request, response);
     });
 
     pub.kill();
 
     credentialsFile(server, 'new access token').scheduleValidate();
 
     run();
   });
 
   test('with a malformed credentials.json, authenticates again and saves '
       'credentials.json', () {
     var server = new ScheduledServer();
     dir(cachePath, [
       file('credentials.json', '{bad json')
     ]).scheduleCreate();
 
     var pub = startPubLish(server);
     authorizePub(pub, server, "new access token");
 
     server.handle('GET', '/packages/versions/new.json', (request, response) {
       expect(request.headers.value('authorization'),
           equals('Bearer new access token'));
 
-      response.outputStream.close();
+      return closeHttpResponse(request, response);
     });
 
     pub.kill();
 
     credentialsFile(server, 'new access token').scheduleValidate();
 
     run();
   });
 }
 
@@ skipping 27 matching lines @@
 
       response.headers.contentType = new ContentType("application", "json");
       response.outputStream.writeString(JSON.stringify({
         "access_token": accessToken,
         "token_type": "bearer"
       }));
       response.outputStream.close();
     });
   });
 }