Honor the --boto flag in download_from_google_storage.

It appears to be parsed and ignored, seems like a bug to me.

BUG=None
TEST=local/manual.

Review URL: https://chromiumcodereview.appspot.com/17265012

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@207404 0039d316-1c4b-4281-b951-d872f2087c98

download_from_google_storage.py

@@ -35,7 +35,7 @@ class InvalidFileError(IOError):
 class Gsutil(object):
   """Call gsutil with some predefined settings.  This is a convenience object,
   and is also immutable."""
-  def __init__(self, path, boto_path=None, timeout=None):
+  def __init__(self, path, boto_path, timeout=None):
     if not os.path.exists(path):
       raise FileNotFoundError('GSUtil not found in %s' % path)
     self.path = path
@@ -313,12 +313,12 @@ def main(args):
 
   # Make sure we can find a working instance of gsutil.
   if os.path.exists(GSUTIL_DEFAULT_PATH):
-    gsutil = Gsutil(GSUTIL_DEFAULT_PATH)
+    gsutil = Gsutil(GSUTIL_DEFAULT_PATH, boto_path=options.boto)
   else:
     gsutil = None
     for path in os.environ["PATH"].split(os.pathsep):
       if os.path.exists(path) and 'gsutil' in os.listdir(path):
-        gsutil = Gsutil(os.path.join(path, 'gsutil'))
+        gsutil = Gsutil(os.path.join(path, 'gsutil'), boto_path=options.boto)
     if not gsutil:
       parser.error('gsutil not found in %s, bad depot_tools checkout?' %
                    GSUTIL_DEFAULT_PATH)
@@ -335,4 +335,4 @@ def main(args):
 
 
 if __name__ == '__main__':
-  sys.exit(main(sys.argv))
+  sys.exit(main(sys.argv))

tests/download_from_google_storage_unittests.py

@@ -28,7 +28,7 @@ TEST_DIR = os.path.dirname(os.path.abspath(__file__))
 
 
 class GsutilMock(object):
-  def __init__(self, path, boto_path=None, timeout=None):
+  def __init__(self, path, boto_path, timeout=None):
     self.path = path
     self.timeout = timeout
     self.boto_path = boto_path
@@ -69,14 +69,14 @@ class GstoolsUnitTests(unittest.TestCase):
     shutil.rmtree(self.temp_dir)
 
   def test_gsutil(self):
-    gsutil = download_from_google_storage.Gsutil(GSUTIL_DEFAULT_PATH)
+    gsutil = download_from_google_storage.Gsutil(GSUTIL_DEFAULT_PATH, None)
     self.assertEqual(gsutil.path, GSUTIL_DEFAULT_PATH)
     code, _, err = gsutil.check_call()
     self.assertEqual(code, 0)
     self.assertEqual(err, '')
 
   def test_gsutil_version(self):
-    gsutil = download_from_google_storage.Gsutil(GSUTIL_DEFAULT_PATH)
+    gsutil = download_from_google_storage.Gsutil(GSUTIL_DEFAULT_PATH, None)
     _, _, err = gsutil.check_call('version')
     err_lines = err.splitlines()
     self.assertEqual(err_lines[0], 'gsutil version 3.25')
@@ -122,7 +122,7 @@ class GstoolsUnitTests(unittest.TestCase):
 
 class DownloadTests(unittest.TestCase):
   def setUp(self):
-    self.gsutil = GsutilMock(GSUTIL_DEFAULT_PATH)
+    self.gsutil = GsutilMock(GSUTIL_DEFAULT_PATH, None)
     self.temp_dir = tempfile.mkdtemp(prefix='gstools_test')
     self.checkout_test_files = os.path.join(
         TEST_DIR, 'gstools', 'download_test_data')
@@ -279,4 +279,4 @@ class DownloadTests(unittest.TestCase):
 
 
 if __name__ == '__main__':
-  unittest.main()
+  unittest.main()