Upgrade gsutil to 3.4

third_party/gsutil/boto/tests/s3/test_connection.py

 # -*- coding: utf-8 -*-
 # Copyright (c) 2006-2011 Mitch Garnaat http://garnaat.org/
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish, dis-
 # tribute, sublicense, and/or sell copies of the Software, and to permit
 # persons to whom the Software is furnished to do so, subject to the fol-
 # lowing conditions:
@@ skipping 11 matching lines @@
 
 """
 Some unit tests for the S3Connection
 """
 
 import unittest
 import time
 import os
 import urllib
 from boto.s3.connection import S3Connection
-from boto.exception import S3PermissionsError
+from boto.s3.bucket import Bucket
+from boto.exception import S3PermissionsError, S3ResponseError
 
 class S3ConnectionTest (unittest.TestCase):
 
     def test_1_basic(self):
         print '--- running S3Connection tests ---'
         c = S3Connection()
         # create a new, empty bucket
         bucket_name = 'test-%d' % int(time.time())
         bucket = c.create_bucket(bucket_name)
         # now try a get_bucket call and see if it's really there
@@ skipping 19 matching lines @@
         fp.close()
         # test generated URLs
         url = k.generate_url(3600)
         file = urllib.urlopen(url)
         assert s1 == file.read(), 'invalid URL %s' % url
         url = k.generate_url(3600, force_http=True)
         file = urllib.urlopen(url)
         assert s1 == file.read(), 'invalid URL %s' % url
         url = k.generate_url(3600, force_http=True, headers={'x-amz-x-token' : 'XYZ'})
         file = urllib.urlopen(url)
+        rh = {'response-content-disposition': 'attachment; filename="foo.txt"'}
+        url = k.generate_url(60, response_headers=rh)
         assert s1 == file.read(), 'invalid URL %s' % url
         bucket.delete_key(k)
         # test a few variations on get_all_keys - first load some data
         # for the first one, let's override the content type
         phony_mimetype = 'application/x-boto-test'
         headers = {'Content-Type': phony_mimetype}
         k.name = 'foo/bar'
         k.set_contents_from_string(s1, headers)
         k.name = 'foo/bas'
         k.set_contents_from_filename('foobar')
@@ skipping 98 matching lines @@
         
         # now delete all keys in bucket
         for k in bucket:
             if k.name == 'reduced_redundancy':
                 assert k.storage_class == 'REDUCED_REDUNDANCY'
             bucket.delete_key(k)
         # now delete bucket
         time.sleep(5)
         c.delete_bucket(bucket)
         print '--- tests completed ---'
+
+    def test_basic_anon(self):
+        auth_con = S3Connection()
+        # create a new, empty bucket
+        bucket_name = 'test-%d' % int(time.time())
+        auth_bucket = auth_con.create_bucket(bucket_name)
+
+        # try read the bucket anonymously
+        anon_con = S3Connection(anon=True)
+        anon_bucket = Bucket(anon_con, bucket_name)
+        try:
+            iter(anon_bucket.list()).next()
+            self.fail("anon bucket list should fail")
+        except S3ResponseError:
+            pass
+
+        # give bucket anon user access and anon read again
+        auth_bucket.set_acl('public-read')
+        try:
+            iter(anon_bucket.list()).next()
+            self.fail("not expecting contents")
+        except S3ResponseError:
+            self.fail("we should have public-read access.")
+        except StopIteration:
+            pass
+
+        # cleanup
+        auth_con.delete_bucket(auth_bucket)