Upgrade gsutil to 3.4

third_party/gsutil/boto/tests/test.py

Index: third_party/gsutil/boto/tests/test.py
diff --git a/third_party/gsutil/20110627/boto/tests/test.py b/third_party/gsutil/boto/tests/test.py
similarity index 61%
rename from third_party/gsutil/20110627/boto/tests/test.py
rename to third_party/gsutil/boto/tests/test.py
index 5a696a4bbe058fcf8baa63b87c879cc9040b2121..991946cbdfa96174d064a16c5065b17fdad31d4c 100755
--- a/third_party/gsutil/20110627/boto/tests/test.py
+++ b/third_party/gsutil/boto/tests/test.py
@@ -32,15 +32,29 @@ import getopt
 from sqs.test_connection import SQSConnectionTest
 from s3.test_connection import S3ConnectionTest
 from s3.test_versioning import S3VersionTest
+from s3.test_mfa import S3MFATest
+from s3.test_encryption import S3EncryptionTest
+from s3.test_bucket import S3BucketTest
+from s3.test_key import S3KeyTest
+from s3.test_multidelete import S3MultiDeleteTest
+from s3.test_multipart import S3MultiPartUploadTest
 from s3.test_gsconnection import GSConnectionTest
 from s3.test_https_cert_validation import CertValidationTest
+from s3.test_resumable_downloads import ResumableDownloadTests
+from s3.test_resumable_uploads import ResumableUploadTests
 from ec2.test_connection import EC2ConnectionTest
+from ec2.elb.test_connection import ELBConnectionTest
+from ec2.cloudwatch.test_connection import CloudWatchConnectionTest
 from autoscale.test_connection import AutoscaleConnectionTest
 from sdb.test_connection import SDBConnectionTest
+from cloudfront.test_signed_urls import CloudfrontSignedUrlsTest
+from dynamodb.test_layer1 import DynamoDBLayer1Test
+from dynamodb.test_layer2 import DynamoDBLayer2Test
+from sts.test_session_token import SessionTokenTest
 
 def usage():
     print "test.py  [-t testsuite] [-v verbosity]"
-    print "    -t   run specific testsuite (s3|ssl|s3ver|s3nover|gs|sqs|ec2|sdb|all)"
+    print "    -t   run specific testsuite (s3|ssl|s3mfa|gs|sqs|ec2|sdb|dynamodb|dynamodbL1|dynamodbL2|sts|all)"
     print "    -v   verbosity (0|1|2)"
 
 def main():
@@ -80,25 +94,47 @@ def suite(testsuite="all"):
         tests.addTest(unittest.makeSuite(EC2ConnectionTest))
         tests.addTest(unittest.makeSuite(SDBConnectionTest))
         tests.addTest(unittest.makeSuite(AutoscaleConnectionTest))
+        tests.addTest(unittest.makeSuite(CloudfrontSignedUrlsTest))
+        tests.addTest(unittest.makeSuite(DynamoDBLayer1Test))
+        tests.addTest(unittest.makeSuite(DynamoDBLayer2Test))
     elif testsuite == "s3":
         tests.addTest(unittest.makeSuite(S3ConnectionTest))
+        tests.addTest(unittest.makeSuite(S3BucketTest))
+        tests.addTest(unittest.makeSuite(S3KeyTest))
+        tests.addTest(unittest.makeSuite(S3MultiPartUploadTest))
         tests.addTest(unittest.makeSuite(S3VersionTest))
+        tests.addTest(unittest.makeSuite(S3EncryptionTest))
+        tests.addTest(unittest.makeSuite(S3MultiDeleteTest))
     elif testsuite == "ssl":
         tests.addTest(unittest.makeSuite(CertValidationTest))
-    elif testsuite == "s3ver":
-        tests.addTest(unittest.makeSuite(S3VersionTest))
-    elif testsuite == "s3nover":
-        tests.addTest(unittest.makeSuite(S3ConnectionTest))
+    elif testsuite == "s3mfa":
+        tests.addTest(unittest.makeSuite(S3MFATest))
     elif testsuite == "gs":
         tests.addTest(unittest.makeSuite(GSConnectionTest))
+        tests.addTest(unittest.makeSuite(ResumableDownloadTests))
+        tests.addTest(unittest.makeSuite(ResumableUploadTests))
     elif testsuite == "sqs":
         tests.addTest(unittest.makeSuite(SQSConnectionTest))
     elif testsuite == "ec2":
         tests.addTest(unittest.makeSuite(EC2ConnectionTest))
+        tests.addTest(unittest.makeSuite(AutoscaleConnectionTest))
+        tests.addTest(unittest.makeSuite(ELBConnectionTest))
+        tests.addTest(unittest.makeSuite(CloudWatchConnectionTest))
     elif testsuite == "autoscale":
         tests.addTest(unittest.makeSuite(AutoscaleConnectionTest))
     elif testsuite == "sdb":
         tests.addTest(unittest.makeSuite(SDBConnectionTest))
+    elif testsuite == "cloudfront":
+        tests.addTest(unittest.makeSuite(CloudfrontSignedUrlsTest))
+    elif testsuite == "dynamodb":
+        tests.addTest(unittest.makeSuite(DynamoDBLayer1Test))
+        tests.addTest(unittest.makeSuite(DynamoDBLayer2Test))
+    elif testsuite == "dynamodbL1":
+        tests.addTest(unittest.makeSuite(DynamoDBLayer1Test))
+    elif testsuite == "dynamodbL2":
+        tests.addTest(unittest.makeSuite(DynamoDBLayer2Test))
+    elif testsuite == "sts":
+        tests.addTest(unittest.makeSuite(SessionTokenTest))
     else:
         raise ValueError("Invalid choice.")
     return tests