Fix ALL the pub tests.

utils/pub/oauth2.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;
 
 import 'dart:async';
 import 'dart:io';
 import 'dart:uri';
 
@@ skipping 51 matching lines @@
 
 /// Asynchronously passes an OAuth2 [Client] to [fn], and closes the client when
 /// the [Future] returned by [fn] completes.
 ///
 /// This takes care of loading and saving the client's credentials, as well as
 /// prompting the user for their authorization. It will also re-authorize and
 /// re-run [fn] if a recoverable authorization error is detected.
 Future withClient(SystemCache cache, Future fn(Client client)) {
   return _getClient(cache).then((client) {
     var completer = new Completer();
-    var future = fn(client);
-    future.whenComplete(() {
-      try {
-        client.close();
-        // Be sure to save the credentials even when an error happens. Also be
-        // sure to pipe the exception from `future` to `completer`.
-        chainToCompleter(
-            _saveCredentials(cache, client.credentials).then((_) => future),
-            completer);
-      } catch (e, stackTrace) {
-        // whenComplete will drop exceptions on the floor. We want to ensure
-        // that any programming errors here don't go un-noticed. See issue 4127.
-        completer.completeError(e, stackTrace);
-      }
+    return asyncWhenComplete(fn(client), () {
+      client.close();
+      // Be sure to save the credentials even when an error happens.
+      return _saveCredentials(cache, client.credentials);
     });
-    return completer.future;
-  }).catchError((e) {
+  }).catchError((asyncError) {
+    var e = getRealError(asyncError);
     if (e is ExpirationException) {
       log.error("Pub's authorization to upload packages has expired and "
           "can't be automatically refreshed.");
       return withClient(cache, fn);
     } else if (e is AuthorizationException) {
       var message = "OAuth2 authorization failed";
       if (e.description != null) message = "$message (${e.description})";
       log.error("$message.");
       return clearCredentials(cache).then((_) => withClient(cache, fn));
     } else {
-      throw e;
+      throw asyncError;
     }
   });
 }
 
 /// Gets a new OAuth2 client. If saved credentials are available, those are
 /// used; otherwise, the user is prompted to authorize the pub client.
 Future<Client> _getClient(SystemCache cache) {
   return _loadCredentials(cache).then((credentials) {
     if (credentials == null) return _authorize();
     return new Future.immediate(new Client(
@@ skipping 99 matching lines @@
       'Pub needs your authorization to upload packages on your behalf.\n'
       'In a web browser, go to $authUrl\n'
       'Then click "Allow access".\n\n'
       'Waiting for your authorization...');
 
   return completer.future.then((client) {
     log.message('Successfully authorized.\n');
     return client;
   });
 }