Fix ALL the pub tests.

utils/pub/command_uploader.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 command_uploader;
 
 import 'dart:async';
 import 'dart:io';
 import 'dart:uri';
 
 import '../../pkg/args/lib/args.dart';
 import '../../pkg/path/lib/path.dart' as path;
 import 'entrypoint.dart';
 import 'exit_codes.dart' as exit_codes;
 import 'http.dart';
 import 'io.dart';
 import 'log.dart' as log;
 import 'oauth2.dart' as oauth2;
 import 'pub.dart';
+import 'utils.dart';
 
 /// Handles the `uploader` pub command.
 class UploaderCommand extends PubCommand {
   final description = "Manage uploaders for a package on pub.dartlang.org.";
   final usage = "pub uploader [options] {add/remove} <email>";
   final requiresEntrypoint = false;
 
   ArgParser get commandParser {
     var parser = new ArgParser();
     // TODO(nweiz): Use HostedSource.defaultUrl as the default value once we use
@@ skipping 38 matching lines @@
         if (command == 'add') {
           var url = server.resolve("/packages/${encodeUriComponent(package)}"
               "/uploaders.json");
           return client.post(url, fields: {"email": uploader});
         } else { // command == 'remove'
           var url = server.resolve("/packages/${encodeUriComponent(package)}"
               "/uploaders/${encodeUriComponent(uploader)}.json");
           return client.delete(url);
         }
       });
-    }).then(handleJsonSuccess).catchError((e) {
-      if (e is! PubHttpException) throw e;
+    }).then(handleJsonSuccess).catchError((asyncError) {
+      var e = getRealError(asyncError);
+      if (e is! PubHttpException) throw asyncError;
       handleJsonError(e.response);
     });
   }
 }