Honor the --boto flag.

depot_tools/tests/download_from_google_storage_unittests.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 # pylint: disable=W0212
 
 """Unit tests for download_from_google_storage.py."""
 
 import optparse
 import os
@@ skipping 10 matching lines @@
 import download_from_google_storage
 
 # ../third_party/gsutil/gsutil
 GSUTIL_DEFAULT_PATH = os.path.join(
     os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
     'third_party', 'gsutil', 'gsutil')
 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
     self.expected = []
     self.history = []
     self.lock = threading.Lock()
 
   def add_expected(self, return_code, out, err):
     self.expected.append((return_code, out, err))
 
@@ skipping 20 matching lines @@
 class GstoolsUnitTests(unittest.TestCase):
   def setUp(self):
     self.temp_dir = tempfile.mkdtemp(prefix='gstools_test')
     self.base_path = os.path.join(self.temp_dir, 'test_files')
     shutil.copytree(os.path.join(TEST_DIR, 'gstools'), self.base_path)
 
   def cleanUp(self):
     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')
     self.assertEqual(
         err_lines[1],
         'checksum 010822c61d38d70ac23600bc955fccf5 (OK)')
 
   def test_get_sha1(self):
     lorem_ipsum = os.path.join(self.base_path, 'lorem_ipsum.txt')
     self.assertEqual(
@@ skipping 25 matching lines @@
     self.assertTrue(os.path.exists(lorem_ipsum2_md5))
     self.assertEqual(
         open(lorem_ipsum2_md5, 'rb').read(),
         '4c02d1eb455a0f22c575265d17b84b6d')
     os.remove(lorem_ipsum2_md5)  # Clean up.
     self.assertFalse(os.path.exists(lorem_ipsum2_md5))
 
 
 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')
     self.base_path = os.path.join(
         self.temp_dir, 'download_test_data')
     shutil.copytree(self.checkout_test_files, self.base_path)
     self.base_url = 'gs://sometesturl'
     self.parser = optparse.OptionParser()
     self.queue = Queue.Queue()
     self.ret_codes = Queue.Queue()
@@ skipping 136 matching lines @@
     expected_calls = [
         ('check_call',
             ('ls', input_filename)),
         ('check_call',
             ('cp', '-q', input_filename, output_filename))]
     self.assertEqual(self.gsutil.history, expected_calls)
     self.assertEqual(code, 0)
 
 
 if __name__ == '__main__':
-  unittest.main()
+  unittest.main()