gcloud 0.0.7 → 0.1.0

data/packages/gsutil/boto/tests/integration/s3/test_cors.py

@@ -1,78 +0,0 @@
-# Copyright (c) 2010 Mitch Garnaat http://garnaat.org/
-# Copyright (c) 2010, Eucalyptus Systems, Inc.
-# All rights reserved.
-#
-# 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:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
-# ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-"""
-Some integration tests for S3 CORS
-"""
-
-import unittest
-import time
-
-from boto.s3.connection import S3Connection
-from boto.exception import S3ResponseError
-from boto.s3.cors import CORSConfiguration
-
-
-class S3CORSTest (unittest.TestCase):
-    s3 = True
-
-    def setUp(self):
-        self.conn = S3Connection()
-        self.bucket_name = 'cors-%d' % int(time.time())
-        self.bucket = self.conn.create_bucket(self.bucket_name)
-
-    def tearDown(self):
-        self.bucket.delete()
-
-    def test_cors(self):
-        self.cfg = CORSConfiguration()
-        self.cfg.add_rule(['PUT', 'POST', 'DELETE'],
-                          'http://www.example.com',
-                          allowed_header='*', max_age_seconds=3000,
-                          expose_header='x-amz-server-side-encryption',
-                          id='foobar_rule')
-        assert self.bucket.set_cors(self.cfg)
-        time.sleep(5)
-        cfg = self.bucket.get_cors()
-        for i, rule in enumerate(cfg):
-            self.assertEqual(rule.id, self.cfg[i].id)
-            self.assertEqual(rule.max_age_seconds, self.cfg[i].max_age_seconds)
-            methods = zip(rule.allowed_method, self.cfg[i].allowed_method)
-            for v1, v2 in methods:
-                self.assertEqual(v1, v2)
-            origins = zip(rule.allowed_origin, self.cfg[i].allowed_origin)
-            for v1, v2 in origins:
-                self.assertEqual(v1, v2)
-            headers = zip(rule.allowed_header, self.cfg[i].allowed_header)
-            for v1, v2 in headers:
-                self.assertEqual(v1, v2)
-            headers = zip(rule.expose_header, self.cfg[i].expose_header)
-            for v1, v2 in headers:
-                self.assertEqual(v1, v2)
-        self.bucket.delete_cors()
-        time.sleep(5)
-        try:
-            self.bucket.get_cors()
-            self.fail('CORS configuration should not be there')
-        except S3ResponseError:
-            pass

data/packages/gsutil/boto/tests/integration/s3/test_encryption.py

@@ -1,115 +0,0 @@
-# Copyright (c) 2010 Mitch Garnaat http://garnaat.org/
-# Copyright (c) 2010, Eucalyptus Systems, Inc.
-# All rights reserved.
-#
-# 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:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
-# ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
-# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-"""
-Some unit tests for the S3 Encryption
-"""
-
-import unittest
-import time
-from boto.s3.connection import S3Connection
-from boto.exception import S3ResponseError
-
-json_policy = """{
-   "Version":"2008-10-17",
-   "Id":"PutObjPolicy",
-   "Statement":[{
-         "Sid":"DenyUnEncryptedObjectUploads",
-         "Effect":"Deny",
-         "Principal":{
-            "AWS":"*"
-         },
-         "Action":"s3:PutObject",
-         "Resource":"arn:aws:s3:::%s/*",
-         "Condition":{
-            "StringNotEquals":{
-               "s3:x-amz-server-side-encryption":"AES256"
-            }
-         }
-      }
-   ]
-}"""
-
-class S3EncryptionTest (unittest.TestCase):
-    s3 = True
-
-    def test_1_versions(self):
-        print '--- running S3Encryption tests ---'
-        c = S3Connection()
-        # create a new, empty bucket
-        bucket_name = 'encryption-%d' % int(time.time())
-        bucket = c.create_bucket(bucket_name)
-        
-        # now try a get_bucket call and see if it's really there
-        bucket = c.get_bucket(bucket_name)
-        
-        # create an unencrypted key
-        k = bucket.new_key('foobar')
-        s1 = 'This is unencrypted data'
-        s2 = 'This is encrypted data'
-        k.set_contents_from_string(s1)
-        time.sleep(5)
-        
-        # now get the contents from s3 
-        o = k.get_contents_as_string()
-        
-        # check to make sure content read from s3 is identical to original
-        assert o == s1
-        
-        # now overwrite that same key with encrypted data
-        k.set_contents_from_string(s2, encrypt_key=True)
-        time.sleep(5)
-        
-        # now retrieve the contents as a string and compare
-        o = k.get_contents_as_string()
-        assert o == s2
-        
-        # now set bucket policy to require encrypted objects
-        bucket.set_policy(json_policy % bucket.name)
-        time.sleep(5)
-        
-        # now try to write unencrypted key
-        write_failed = False
-        try:
-            k.set_contents_from_string(s1)
-        except S3ResponseError:
-            write_failed = True
-
-        assert write_failed
-        
-        # now try to write unencrypted key
-        write_failed = False
-        try:
-            k.set_contents_from_string(s1, encrypt_key=True)
-        except S3ResponseError:
-            write_failed = True
-
-        assert not write_failed
-        
-        # Now do regular delete
-        k.delete()
-        time.sleep(5)
-
-        # now delete bucket
-        bucket.delete()
-        print '--- tests completed ---'

data/packages/gsutil/boto/tests/integration/s3/test_https_cert_validation.py

@@ -1,141 +0,0 @@
-# Copyright 2011 Google Inc.
-#
-# 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:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
-# ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-"""
-Tests to validate correct validation of SSL server certificates.
-
-Note that this test assumes two external dependencies are available:
-  - A http proxy, which by default is assumed to be at host 'cache' and port
-    3128.  This can be overridden with environment variables PROXY_HOST and
-    PROXY_PORT, respectively.
-  - An ssl-enabled web server that will return a valid certificate signed by one
-    of the bundled CAs, and which can be reached by an alternate hostname that
-    does not match the CN in that certificate.  By default, this test uses host
-    'www' (without fully qualified domain). This can be overridden with
-    environment variable INVALID_HOSTNAME_HOST. If no suitable host is already
-    available, such a mapping can be established by temporarily adding an IP
-    address for, say, www.google.com or www.amazon.com to /etc/hosts.
-"""
-
-import os
-import ssl
-import unittest
-
-from nose.plugins.attrib import attr
-
-import boto
-from boto import exception, https_connection
-from boto.gs.connection import GSConnection
-from boto.s3.connection import S3Connection
-
-
-# File 'other_cacerts.txt' contains a valid CA certificate of a CA that is used
-# by neither S3 nor Google Cloud Storage. Validation against this CA cert should
-# result in a certificate error.
-DEFAULT_CA_CERTS_FILE = os.path.join(
-        os.path.dirname(os.path.abspath(__file__ )), 'other_cacerts.txt')
-
-
-PROXY_HOST = os.environ.get('PROXY_HOST', 'cache')
-PROXY_PORT = os.environ.get('PROXY_PORT', '3128')
-
-# This test assumes that this host returns a certificate signed by one of the
-# trusted CAs, but with a Common Name that won't match host name 'www' (i.e.,
-# the server should return a certificate with CN 'www.<somedomain>.com').
-INVALID_HOSTNAME_HOST = os.environ.get('INVALID_HOSTNAME_HOST', 'www')
-
-
-@attr('notdefault', 'ssl')
-class CertValidationTest(unittest.TestCase):
-    def setUp(self):
-        # Clear config
-        for section in boto.config.sections():
-            boto.config.remove_section(section)
-
-        # Enable https_validate_certificates.
-        boto.config.add_section('Boto')
-        boto.config.setbool('Boto', 'https_validate_certificates', True)
-
-        # Set up bogus credentials so that the auth module is willing to go
-        # ahead and make a request; the request should fail with a service-level
-        # error if it does get to the service (S3 or GS).
-        boto.config.add_section('Credentials')
-        boto.config.set('Credentials', 'gs_access_key_id', 'xyz')
-        boto.config.set('Credentials', 'gs_secret_access_key', 'xyz')
-        boto.config.set('Credentials', 'aws_access_key_id', 'xyz')
-        boto.config.set('Credentials', 'aws_secret_access_key', 'xyz')
-
-    def enableProxy(self):
-        boto.config.set('Boto', 'proxy', PROXY_HOST)
-        boto.config.set('Boto', 'proxy_port', PROXY_PORT)
-
-    def assertConnectionThrows(self, connection_class, error):
-        conn = connection_class()
-        self.assertRaises(error, conn.get_all_buckets)
-
-    def do_test_valid_cert(self):
-        # When connecting to actual servers with bundled root certificates, no
-        # cert errors should be thrown; instead we will get "invalid
-        # credentials" errors since the config used does not contain any
-        # credentials.
-        self.assertConnectionThrows(S3Connection, exception.S3ResponseError)
-        self.assertConnectionThrows(GSConnection, exception.GSResponseError)
-
-    def test_valid_cert(self):
-        self.do_test_valid_cert()
-
-    def test_valid_cert_with_proxy(self):
-        self.enableProxy()
-        self.do_test_valid_cert()
-
-    def do_test_invalid_signature(self):
-        boto.config.set('Boto', 'ca_certificates_file', DEFAULT_CA_CERTS_FILE)
-        self.assertConnectionThrows(S3Connection, ssl.SSLError)
-        self.assertConnectionThrows(GSConnection, ssl.SSLError)
-
-    def test_invalid_signature(self):
-        self.do_test_invalid_signature()
-
-    def test_invalid_signature_with_proxy(self):
-        self.enableProxy()
-        self.do_test_invalid_signature()
-
-    def do_test_invalid_host(self):
-        boto.config.set('Credentials', 'gs_host', INVALID_HOSTNAME_HOST)
-        boto.config.set('Credentials', 's3_host', INVALID_HOSTNAME_HOST)
-        self.assertConnectionThrows(S3Connection, ssl.SSLError)
-        self.assertConnectionThrows(GSConnection, ssl.SSLError)
-
-    def do_test_invalid_host(self):
-        boto.config.set('Credentials', 'gs_host', INVALID_HOSTNAME_HOST)
-        boto.config.set('Credentials', 's3_host', INVALID_HOSTNAME_HOST)
-        self.assertConnectionThrows(
-                S3Connection, https_connection.InvalidCertificateException)
-        self.assertConnectionThrows(
-                GSConnection, https_connection.InvalidCertificateException)
-
-    def test_invalid_host(self):
-        self.do_test_invalid_host()
-
-    def test_invalid_host_with_proxy(self):
-        self.enableProxy()
-        self.do_test_invalid_host()
-

data/packages/gsutil/boto/tests/integration/s3/test_key.py

@@ -1,375 +0,0 @@
-# Copyright (c) 2012 Mitch Garnaat http://garnaat.org/
-# All rights reserved.
-#
-# 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:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
-# ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-"""
-Some unit tests for S3 Key
-"""
-
-from tests.unit import unittest
-import time
-import StringIO
-from boto.s3.connection import S3Connection
-from boto.s3.key import Key
-from boto.exception import S3ResponseError
-
-
-class S3KeyTest (unittest.TestCase):
-    s3 = True
-
-    def setUp(self):
-        self.conn = S3Connection()
-        self.bucket_name = 'keytest-%d' % int(time.time())
-        self.bucket = self.conn.create_bucket(self.bucket_name)
-
-    def tearDown(self):
-        for key in self.bucket:
-            key.delete()
-        self.bucket.delete()
-
-    def test_set_contents_from_file_dataloss(self):
-        # Create an empty stringio and write to it.
-        content = "abcde"
-        sfp = StringIO.StringIO()
-        sfp.write(content)
-        # Try set_contents_from_file() without rewinding sfp
-        k = self.bucket.new_key("k")
-        try:
-            k.set_contents_from_file(sfp)
-            self.fail("forgot to rewind so should fail.")
-        except AttributeError:
-            pass
-        # call with rewind and check if we wrote 5 bytes
-        k.set_contents_from_file(sfp, rewind=True)
-        self.assertEqual(k.size, 5)
-        # check actual contents by getting it.
-        kn = self.bucket.new_key("k")
-        ks = kn.get_contents_as_string()
-        self.assertEqual(ks, content)
-
-        # finally, try with a 0 length string
-        sfp = StringIO.StringIO()
-        k = self.bucket.new_key("k")
-        k.set_contents_from_file(sfp)
-        self.assertEqual(k.size, 0)
-        # check actual contents by getting it.
-        kn = self.bucket.new_key("k")
-        ks = kn.get_contents_as_string()
-        self.assertEqual(ks, "")
-
-    def test_set_contents_as_file(self):
-        content="01234567890123456789"
-        sfp = StringIO.StringIO(content)
-
-        # fp is set at 0 for just opened (for read) files.
-        # set_contents should write full content to key.
-        k = self.bucket.new_key("k")
-        k.set_contents_from_file(sfp)
-        self.assertEqual(k.size, 20)
-        kn = self.bucket.new_key("k")
-        ks = kn.get_contents_as_string()
-        self.assertEqual(ks, content)
-
-        # set fp to 5 and set contents. this should
-        # set "567890123456789" to the key
-        sfp.seek(5)
-        k = self.bucket.new_key("k")
-        k.set_contents_from_file(sfp)
-        self.assertEqual(k.size, 15)
-        kn = self.bucket.new_key("k")
-        ks = kn.get_contents_as_string()
-        self.assertEqual(ks, content[5:])
-
-        # set fp to 5 and only set 5 bytes. this should
-        # write the value "56789" to the key.
-        sfp.seek(5)
-        k = self.bucket.new_key("k")
-        k.set_contents_from_file(sfp, size=5)
-        self.assertEqual(k.size, 5)
-        self.assertEqual(sfp.tell(), 10)
-        kn = self.bucket.new_key("k")
-        ks = kn.get_contents_as_string()
-        self.assertEqual(ks, content[5:10])
-
-    def test_set_contents_with_md5(self):
-        content="01234567890123456789"
-        sfp = StringIO.StringIO(content)
-
-        # fp is set at 0 for just opened (for read) files.
-        # set_contents should write full content to key.
-        k = self.bucket.new_key("k")
-        good_md5 = k.compute_md5(sfp)
-        k.set_contents_from_file(sfp, md5=good_md5)
-        kn = self.bucket.new_key("k")
-        ks = kn.get_contents_as_string()
-        self.assertEqual(ks, content)
-
-        # set fp to 5 and only set 5 bytes. this should
-        # write the value "56789" to the key.
-        sfp.seek(5)
-        k = self.bucket.new_key("k")
-        good_md5 = k.compute_md5(sfp, size=5)
-        k.set_contents_from_file(sfp, size=5, md5=good_md5)
-        self.assertEqual(sfp.tell(), 10)
-        kn = self.bucket.new_key("k")
-        ks = kn.get_contents_as_string()
-        self.assertEqual(ks, content[5:10])
-
-        # let's try a wrong md5 by just altering it.
-        k = self.bucket.new_key("k")
-        sfp.seek(0)
-        hexdig, base64 = k.compute_md5(sfp)
-        bad_md5 = (hexdig, base64[3:])
-        try:
-            k.set_contents_from_file(sfp, md5=bad_md5)
-            self.fail("should fail with bad md5")
-        except S3ResponseError:
-            pass
-
-    def test_get_contents_with_md5(self):
-        content="01234567890123456789"
-        sfp = StringIO.StringIO(content)
-
-        k = self.bucket.new_key("k")
-        k.set_contents_from_file(sfp)
-        kn = self.bucket.new_key("k")
-        s = kn.get_contents_as_string()
-        self.assertEqual(kn.md5, k.md5)
-        self.assertEqual(s, content)
-
-    def test_file_callback(self):
-        def callback(wrote, total):
-            self.my_cb_cnt += 1
-            self.assertNotEqual(wrote, self.my_cb_last, "called twice with same value")
-            self.my_cb_last = wrote
-
-        # Zero bytes written => 1 call
-        self.my_cb_cnt = 0
-        self.my_cb_last = None
-        k = self.bucket.new_key("k")
-        k.BufferSize = 2
-        sfp = StringIO.StringIO("")
-        k.set_contents_from_file(sfp, cb=callback, num_cb=10)
-        self.assertEqual(self.my_cb_cnt, 1)
-        self.assertEqual(self.my_cb_last, 0)
-        sfp.close()
-
-        # Read back zero bytes => 1 call
-        self.my_cb_cnt = 0
-        self.my_cb_last = None
-        s = k.get_contents_as_string(cb=callback)
-        self.assertEqual(self.my_cb_cnt, 1)
-        self.assertEqual(self.my_cb_last, 0)
-
-        content="01234567890123456789"
-        sfp = StringIO.StringIO(content)
-
-        # expect 2 calls due start/finish
-        self.my_cb_cnt = 0
-        self.my_cb_last = None
-        k = self.bucket.new_key("k")
-        k.set_contents_from_file(sfp, cb=callback, num_cb=10)
-        self.assertEqual(self.my_cb_cnt, 2)
-        self.assertEqual(self.my_cb_last, 20)
-
-        # Read back all bytes => 2 calls
-        self.my_cb_cnt = 0
-        self.my_cb_last = None
-        s = k.get_contents_as_string(cb=callback)
-        self.assertEqual(self.my_cb_cnt, 2)
-        self.assertEqual(self.my_cb_last, 20)
-        self.assertEqual(s, content)
-
-        # rewind sfp and try upload again. -1 should call
-        # for every read/write so that should make 11 when bs=2
-        sfp.seek(0)
-        self.my_cb_cnt = 0
-        self.my_cb_last = None
-        k = self.bucket.new_key("k")
-        k.BufferSize = 2
-        k.set_contents_from_file(sfp, cb=callback, num_cb=-1)
-        self.assertEqual(self.my_cb_cnt, 11)
-        self.assertEqual(self.my_cb_last, 20)
-
-        # Read back all bytes => 11 calls
-        self.my_cb_cnt = 0
-        self.my_cb_last = None
-        s = k.get_contents_as_string(cb=callback, num_cb=-1)
-        self.assertEqual(self.my_cb_cnt, 11)
-        self.assertEqual(self.my_cb_last, 20)
-        self.assertEqual(s, content)
-
-        # no more than 1 times => 2 times
-        # last time always 20 bytes
-        sfp.seek(0)
-        self.my_cb_cnt = 0
-        self.my_cb_last = None
-        k = self.bucket.new_key("k")
-        k.BufferSize = 2
-        k.set_contents_from_file(sfp, cb=callback, num_cb=1)
-        self.assertTrue(self.my_cb_cnt <= 2)
-        self.assertEqual(self.my_cb_last, 20)
-
-        # no more than 1 times => 2 times
-        self.my_cb_cnt = 0
-        self.my_cb_last = None
-        s = k.get_contents_as_string(cb=callback, num_cb=1)
-        self.assertTrue(self.my_cb_cnt <= 2)
-        self.assertEqual(self.my_cb_last, 20)
-        self.assertEqual(s, content)
-
-        # no more than 2 times
-        # last time always 20 bytes
-        sfp.seek(0)
-        self.my_cb_cnt = 0
-        self.my_cb_last = None
-        k = self.bucket.new_key("k")
-        k.BufferSize = 2
-        k.set_contents_from_file(sfp, cb=callback, num_cb=2)
-        self.assertTrue(self.my_cb_cnt <= 2)
-        self.assertEqual(self.my_cb_last, 20)
-
-        # no more than 2 times
-        self.my_cb_cnt = 0
-        self.my_cb_last = None
-        s = k.get_contents_as_string(cb=callback, num_cb=2)
-        self.assertTrue(self.my_cb_cnt <= 2)
-        self.assertEqual(self.my_cb_last, 20)
-        self.assertEqual(s, content)
-
-        # no more than 3 times
-        # last time always 20 bytes
-        sfp.seek(0)
-        self.my_cb_cnt = 0
-        self.my_cb_last = None
-        k = self.bucket.new_key("k")
-        k.BufferSize = 2
-        k.set_contents_from_file(sfp, cb=callback, num_cb=3)
-        self.assertTrue(self.my_cb_cnt <= 3)
-        self.assertEqual(self.my_cb_last, 20)
-
-        # no more than 3 times
-        self.my_cb_cnt = 0
-        self.my_cb_last = None
-        s = k.get_contents_as_string(cb=callback, num_cb=3)
-        self.assertTrue(self.my_cb_cnt <= 3)
-        self.assertEqual(self.my_cb_last, 20)
-        self.assertEqual(s, content)
-
-        # no more than 4 times
-        # last time always 20 bytes
-        sfp.seek(0)
-        self.my_cb_cnt = 0
-        self.my_cb_last = None
-        k = self.bucket.new_key("k")
-        k.BufferSize = 2
-        k.set_contents_from_file(sfp, cb=callback, num_cb=4)
-        self.assertTrue(self.my_cb_cnt <= 4)
-        self.assertEqual(self.my_cb_last, 20)
-
-        # no more than 4 times
-        self.my_cb_cnt = 0
-        self.my_cb_last = None
-        s = k.get_contents_as_string(cb=callback, num_cb=4)
-        self.assertTrue(self.my_cb_cnt <= 4)
-        self.assertEqual(self.my_cb_last, 20)
-        self.assertEqual(s, content)
-
-        # no more than 6 times
-        # last time always 20 bytes
-        sfp.seek(0)
-        self.my_cb_cnt = 0
-        self.my_cb_last = None
-        k = self.bucket.new_key("k")
-        k.BufferSize = 2
-        k.set_contents_from_file(sfp, cb=callback, num_cb=6)
-        self.assertTrue(self.my_cb_cnt <= 6)
-        self.assertEqual(self.my_cb_last, 20)
-
-        # no more than 6 times
-        self.my_cb_cnt = 0
-        self.my_cb_last = None
-        s = k.get_contents_as_string(cb=callback, num_cb=6)
-        self.assertTrue(self.my_cb_cnt <= 6)
-        self.assertEqual(self.my_cb_last, 20)
-        self.assertEqual(s, content)
-
-        # no more than 10 times
-        # last time always 20 bytes
-        sfp.seek(0)
-        self.my_cb_cnt = 0
-        self.my_cb_last = None
-        k = self.bucket.new_key("k")
-        k.BufferSize = 2
-        k.set_contents_from_file(sfp, cb=callback, num_cb=10)
-        self.assertTrue(self.my_cb_cnt <= 10)
-        self.assertEqual(self.my_cb_last, 20)
-
-        # no more than 10 times
-        self.my_cb_cnt = 0
-        self.my_cb_last = None
-        s = k.get_contents_as_string(cb=callback, num_cb=10)
-        self.assertTrue(self.my_cb_cnt <= 10)
-        self.assertEqual(self.my_cb_last, 20)
-        self.assertEqual(s, content)
-
-        # no more than 1000 times
-        # last time always 20 bytes
-        sfp.seek(0)
-        self.my_cb_cnt = 0
-        self.my_cb_last = None
-        k = self.bucket.new_key("k")
-        k.BufferSize = 2
-        k.set_contents_from_file(sfp, cb=callback, num_cb=1000)
-        self.assertTrue(self.my_cb_cnt <= 1000)
-        self.assertEqual(self.my_cb_last, 20)
-
-        # no more than 1000 times
-        self.my_cb_cnt = 0
-        self.my_cb_last = None
-        s = k.get_contents_as_string(cb=callback, num_cb=1000)
-        self.assertTrue(self.my_cb_cnt <= 1000)
-        self.assertEqual(self.my_cb_last, 20)
-        self.assertEqual(s, content)
-
-    def test_website_redirects(self):
-        self.bucket.configure_website('index.html')
-        key = self.bucket.new_key('redirect-key')
-        self.assertTrue(key.set_redirect('http://www.amazon.com/'))
-        self.assertEqual(key.get_redirect(), 'http://www.amazon.com/')
-
-        self.assertTrue(key.set_redirect('http://aws.amazon.com/'))
-        self.assertEqual(key.get_redirect(), 'http://aws.amazon.com/')
-
-    def test_website_redirect_none_configured(self):
-        key = self.bucket.new_key('redirect-key')
-        key.set_contents_from_string('')
-        self.assertEqual(key.get_redirect(), None)
-
-    def test_website_redirect_with_bad_value(self):
-        self.bucket.configure_website('index.html')
-        key = self.bucket.new_key('redirect-key')
-        with self.assertRaises(key.provider.storage_response_error):
-            # Must start with a / or http
-            key.set_redirect('ftp://ftp.example.org')
-        with self.assertRaises(key.provider.storage_response_error):
-            # Must start with a / or http
-            key.set_redirect('')