Update checked in version of gsutil to version 4.6

third_party/boto/tests/integration/gs/test_basic.py

 # -*- coding: utf-8 -*-
 # Copyright (c) 2006-2011 Mitch Garnaat http://garnaat.org/
 # Copyright (c) 2010, Eucalyptus Systems, Inc.
 # Copyright (c) 2011, Nexenta Systems, Inc.
 # Copyright (c) 2012, Google, 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
@@ skipping 13 matching lines @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
 """
 Some integration tests for the GSConnection
 """
 
 import os
 import re
 import StringIO
+import urllib
 import xml.sax
 
 from boto import handler
 from boto import storage_uri
 from boto.gs.acl import ACL
 from boto.gs.cors import Cors
 from boto.gs.lifecycle import LifecycleConfig
 from tests.integration.gs.testcase import GSTestCase
 
 
@@ skipping 48 matching lines @@
         tmpdir = self._MakeTempDir()
         fpath = os.path.join(tmpdir, key_name)
         fp = open(fpath, 'wb')
         # now get the contents from gcs to a local file
         k.get_contents_to_file(fp)
         fp.close()
         fp = open(fpath)
         # check to make sure content read from gcs is identical to original
         self.assertEqual(s1, fp.read())
         fp.close()
+        # Use generate_url to get the contents
+        url = self._conn.generate_url(900, 'GET', bucket=bucket.name, key=key_name)
+        f = urllib.urlopen(url)
+        self.assertEqual(s1, f.read())
+        f.close()
         # check to make sure set_contents_from_file is working
         sfp = StringIO.StringIO('foo')
         k.set_contents_from_file(sfp)
         self.assertEqual(k.get_contents_as_string(), 'foo')
         sfp2 = StringIO.StringIO('foo2')
         k.set_contents_from_file(sfp2)
         self.assertEqual(k.get_contents_as_string(), 'foo2')
 
     def test_get_all_keys(self):
         """Tests get_all_keys."""
@@ skipping 307 matching lines @@
         uri = storage_uri('gs://' + bucket_name)
         # get lifecycle config and make sure it's empty
         xml = uri.get_lifecycle_config().to_xml()
         self.assertEqual(xml, LIFECYCLE_EMPTY)
         # set lifecycle config
         lifecycle_config = LifecycleConfig()
         lifecycle_config.add_rule('Delete', None, LIFECYCLE_CONDITIONS)
         uri.configure_lifecycle(lifecycle_config)
         xml = uri.get_lifecycle_config().to_xml()
         self.assertEqual(xml, LIFECYCLE_DOC)