Re-enable and update pub_uploader_test.

BUG=https://code.google.com/p/dart/issues/detail?id=9357
R=sgjesse@google.com

Review URL: https://codereview.chromium.org//16739004

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge@23840 260f80e4-7a28-3924-810f-c04153c831b5

pub.status

@@ -2,8 +2,6 @@
 # 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.
 
-test/pub_uploader_test: Pass, Fail # Issue 9357
-
 # Pub only runs on the VM, so just rule out all compilers.
 [ $compiler == dart2js || $compiler == dart2dart ]
 *: Skip

test/pub_uploader_test.dart

@@ -17,15 +17,16 @@ 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) =>