Re-enable and update pub_uploader_test.

sdk/lib/_internal/pub/test/pub_uploader_test.dart

 // Copyright (c) 2013, 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_uploader_test;
 
 import 'dart:io';
 import 'dart:json' as json;
 
 import 'package:scheduled_test/scheduled_process.dart';
 import 'package:scheduled_test/scheduled_server.dart';
 import 'package:scheduled_test/scheduled_test.dart';
 
 import '../lib/src/io.dart';
 import '../lib/src/utils.dart';
 import 'descriptor.dart' as d;
 import 'test_pub.dart';
 
 final USAGE_STRING = '''
-    Manage uploaders for a package on pub.dartlang.org.
+Manage uploaders for a package on pub.dartlang.org.
 
-    Usage: pub uploader [options] {add/remove} <email>
-    --server     The package server on which the package is hosted
+Usage: pub uploader [options] {add/remove} <email>
+-h, --help       Print usage information for this command.
+    --server     The package server on which the package is hosted.
                  (defaults to "https://pub.dartlang.org")
 
-    --package    The package whose uploaders will be modified
+    --package    The package whose uploaders will be modified.
                  (defaults to the current package)
-    ''';
+''';
 
 ScheduledProcess startPubUploader(ScheduledServer server, List<String> args) {
   var tokenEndpoint = server.url.then((url) =>
       url.resolve('/token').toString());
   args = flatten(['uploader', '--server', tokenEndpoint, args]);
   return startPub(args: args, tokenEndpoint: tokenEndpoint);
 }
 
 main() {
   initConfig();
@@ skipping 136 matching lines @@
     server.handle('DELETE', '/api/packages/pkg/uploaders/email', (request) {
       request.response.write("{not json");
       request.response.close();
     });
 
     expect(pub.nextErrLine(), completion(equals('Invalid server response:')));
     expect(pub.nextErrLine(), completion(equals('{not json')));
     pub.shouldExit(1);
   });
 }