Update checked in version of gsutil to version 4.6

gslib/tests/test_command_runner.py

Index: gslib/tests/test_command_runner.py
===================================================================
--- gslib/tests/test_command_runner.py	(revision 33376)
+++ gslib/tests/test_command_runner.py	(working copy)
@@ -1,5 +1,5 @@
+# -*- coding: utf-8 -*-
 # Copyright 2011 Google Inc. All Rights Reserved.
-#coding=utf8
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,19 +12,23 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+"""Unit and integration tests for gsutil command_runner module."""
 
+from __future__ import absolute_import
+
 import logging
 import os
 import time
 
-import boto
-
 import gslib
-from boto.pyami.config import Config, BotoConfigLocations
 from gslib import command_runner
 from gslib.command_runner import HandleArgCoding
 from gslib.exception import CommandException
 import gslib.tests.testcase as testcase
+import gslib.tests.util as util
+from gslib.tests.util import SetBotoConfigFileForTest
+from gslib.tests.util import SetBotoConfigForTest
+from gslib.tests.util import unittest
 from gslib.util import GSUTIL_PUB_TARBALL
 from gslib.util import SECONDS_PER_DAY
 
@@ -34,6 +38,7 @@
   """Unit tests for gsutil update check in command_runner module."""
 
   def setUp(self):
+    """Sets up the command runner mock objects."""
     super(TestCommandRunnerUnitTests, self).setUp()
 
     # Mock out the timestamp file so we can manipulate it.
@@ -50,7 +55,7 @@
         raise CommandException(
             'Version number (%s) is not numeric.' % gslib.VERSION)
       base_version = base_version[:-1]
-    command_runner.LookUpGsutilVersion = lambda u: float(base_version) + 1
+    command_runner.LookUpGsutilVersion = lambda u, v: float(base_version) + 1
 
     # Mock out raw_input to trigger yes prompt.
     command_runner.raw_input = lambda p: 'y'
@@ -70,10 +75,8 @@
         bucket_uri=self.pub_bucket_uri, object_name='gsutil.tar.gz',
         contents='foo')
 
-    # Stores list of boto configs to set back to what they were.
-    self.boto_configs = []
-
   def tearDown(self):
+    """Tears down the command runner mock objects."""
     super(TestCommandRunnerUnitTests, self).tearDown()
 
     command_runner.LAST_CHECKED_FOR_GSUTIL_UPDATE_TIMESTAMP_FILE = (
@@ -88,27 +91,19 @@
     self.gsutil_tarball_uri.delete_key()
     self.pub_bucket_uri.delete_bucket()
 
-    for section, name, value in self.boto_configs:
-      if value is None:
-        boto.config.remove_option(section, name)
-      else:
-        boto.config.set(section, name, value)
-
-  def _SetBotoConfig(self, section, name, value):
-    prev_value = boto.config.get(section, name, None)
-    self.boto_configs.append((section, name, prev_value))
-    boto.config.set(section, name, value)
-
+  @unittest.skipUnless(not util.HAS_GS_HOST, 'gs_host is defined in config')
   def test_not_interactive(self):
     """Tests that update is not triggered if not running interactively."""
-    self._SetBotoConfig('GSUtil', 'software_update_check_period', '1')
-    with open(self.timestamp_file, 'w') as f:
-      f.write(str(int(time.time() - 2 * SECONDS_PER_DAY)))
-    self.running_interactively = False
-    self.assertEqual(
-        False,
-        self.command_runner._MaybeCheckForAndOfferSoftwareUpdate('ls', 0))
+    with SetBotoConfigForTest([
+        ('GSUtil', 'software_update_check_period', '1')]):
+      with open(self.timestamp_file, 'w') as f:
+        f.write(str(int(time.time() - 2 * SECONDS_PER_DAY)))
+      self.running_interactively = False
+      self.assertEqual(
+          False,
+          self.command_runner.MaybeCheckForAndOfferSoftwareUpdate('ls', 0))
 
+  @unittest.skipUnless(not util.HAS_GS_HOST, 'gs_host is defined in config')
   def test_no_tracker_file_version_recent(self):
     """Tests when no timestamp file exists and VERSION file is recent."""
     if os.path.exists(self.timestamp_file):
@@ -117,8 +112,9 @@
     self.version_mod_time = time.time()
     self.assertEqual(
         False,
-        self.command_runner._MaybeCheckForAndOfferSoftwareUpdate('ls', 0))
+        self.command_runner.MaybeCheckForAndOfferSoftwareUpdate('ls', 0))
 
+  @unittest.skipUnless(not util.HAS_GS_HOST, 'gs_host is defined in config')
   def test_no_tracker_file_version_old(self):
     """Tests when no timestamp file exists and VERSION file is old."""
     if os.path.exists(self.timestamp_file):
@@ -128,78 +124,86 @@
     expect = not gslib.IS_PACKAGE_INSTALL
     self.assertEqual(
         expect,
-        self.command_runner._MaybeCheckForAndOfferSoftwareUpdate('ls', 0))
+        self.command_runner.MaybeCheckForAndOfferSoftwareUpdate('ls', 0))
 
+  @unittest.skipUnless(not util.HAS_GS_HOST, 'gs_host is defined in config')
   def test_invalid_commands(self):
     """Tests that update is not triggered for certain commands."""
     self.assertEqual(
         False,
-        self.command_runner._MaybeCheckForAndOfferSoftwareUpdate('update', 0))
+        self.command_runner.MaybeCheckForAndOfferSoftwareUpdate('update', 0))
 
+  @unittest.skipUnless(not util.HAS_GS_HOST, 'gs_host is defined in config')
   def test_invalid_file_contents(self):
     """Tests no update if timestamp file has invalid value."""
     with open(self.timestamp_file, 'w') as f:
       f.write('NaN')
     self.assertEqual(
         False,
-        self.command_runner._MaybeCheckForAndOfferSoftwareUpdate('ls', 0))
+        self.command_runner.MaybeCheckForAndOfferSoftwareUpdate('ls', 0))
 
+  @unittest.skipUnless(not util.HAS_GS_HOST, 'gs_host is defined in config')
   def test_update_should_trigger(self):
     """Tests update should be triggered if time is up."""
-    self._SetBotoConfig('GSUtil', 'software_update_check_period', '1')
-    with open(self.timestamp_file, 'w') as f:
-      f.write(str(int(time.time() - 2 * SECONDS_PER_DAY)))
-    # Update will not trigger for package installs.
-    expect = not gslib.IS_PACKAGE_INSTALL
-    self.assertEqual(
-        expect,
-        self.command_runner._MaybeCheckForAndOfferSoftwareUpdate('ls', 0))
+    with SetBotoConfigForTest([
+        ('GSUtil', 'software_update_check_period', '1')]):
+      with open(self.timestamp_file, 'w') as f:
+        f.write(str(int(time.time() - 2 * SECONDS_PER_DAY)))
+      # Update will not trigger for package installs.
+      expect = not gslib.IS_PACKAGE_INSTALL
+      self.assertEqual(
+          expect,
+          self.command_runner.MaybeCheckForAndOfferSoftwareUpdate('ls', 0))
 
+  @unittest.skipUnless(not util.HAS_GS_HOST, 'gs_host is defined in config')
   def test_not_time_for_update_yet(self):
     """Tests update not triggered if not time yet."""
-    self._SetBotoConfig('GSUtil', 'software_update_check_period', '3')
-    with open(self.timestamp_file, 'w') as f:
-      f.write(str(int(time.time() - 2 * SECONDS_PER_DAY)))
-    self.assertEqual(
-        False,
-        self.command_runner._MaybeCheckForAndOfferSoftwareUpdate('ls', 0))
+    with SetBotoConfigForTest([
+        ('GSUtil', 'software_update_check_period', '3')]):
+      with open(self.timestamp_file, 'w') as f:
+        f.write(str(int(time.time() - 2 * SECONDS_PER_DAY)))
+      self.assertEqual(
+          False,
+          self.command_runner.MaybeCheckForAndOfferSoftwareUpdate('ls', 0))
 
   def test_user_says_no_to_update(self):
     """Tests no update triggered if user says no at the prompt."""
-    self._SetBotoConfig('GSUtil', 'software_update_check_period', '1')
-    with open(self.timestamp_file, 'w') as f:
-      f.write(str(int(time.time() - 2 * SECONDS_PER_DAY)))
-    command_runner.raw_input = lambda p: 'n'
-    self.assertEqual(
-        False,
-        self.command_runner._MaybeCheckForAndOfferSoftwareUpdate('ls', 0))
+    with SetBotoConfigForTest([
+        ('GSUtil', 'software_update_check_period', '1')]):
+      with open(self.timestamp_file, 'w') as f:
+        f.write(str(int(time.time() - 2 * SECONDS_PER_DAY)))
+      command_runner.raw_input = lambda p: 'n'
+      self.assertEqual(
+          False,
+          self.command_runner.MaybeCheckForAndOfferSoftwareUpdate('ls', 0))
 
+  @unittest.skipUnless(not util.HAS_GS_HOST, 'gs_host is defined in config')
   def test_update_check_skipped_with_quiet_mode(self):
     """Tests that update isn't triggered when loglevel is in quiet mode."""
-    self._SetBotoConfig('GSUtil', 'software_update_check_period', '1')
-    with open(self.timestamp_file, 'w') as f:
-      f.write(str(int(time.time() - 2 * SECONDS_PER_DAY)))
+    with SetBotoConfigForTest([
+        ('GSUtil', 'software_update_check_period', '1')]):
+      with open(self.timestamp_file, 'w') as f:
+        f.write(str(int(time.time() - 2 * SECONDS_PER_DAY)))
 
-    # With regular loglevel, should return True except for package installs.
-    expect = not gslib.IS_PACKAGE_INSTALL
-    self.assertEqual(
-      expect,
-      self.command_runner._MaybeCheckForAndOfferSoftwareUpdate('ls', 0))
-
-    prev_loglevel = logging.getLogger().getEffectiveLevel()
-    try:
-      logging.getLogger().setLevel(logging.ERROR)
-      # With reduced loglevel, should return False.
+      # With regular loglevel, should return True except for package installs.
+      expect = not gslib.IS_PACKAGE_INSTALL
       self.assertEqual(
-        False,
-        self.command_runner._MaybeCheckForAndOfferSoftwareUpdate('ls', 0))
-    finally:
-      logging.getLogger().setLevel(prev_loglevel)
+          expect,
+          self.command_runner.MaybeCheckForAndOfferSoftwareUpdate('ls', 0))
 
+      prev_loglevel = logging.getLogger().getEffectiveLevel()
+      try:
+        logging.getLogger().setLevel(logging.ERROR)
+        # With reduced loglevel, should return False.
+        self.assertEqual(
+            False,
+            self.command_runner.MaybeCheckForAndOfferSoftwareUpdate('ls', 0))
+      finally:
+        logging.getLogger().setLevel(prev_loglevel)
+
+  # pylint: disable=invalid-encoded-data
   def test_valid_arg_coding(self):
-    """
-    Tests that gsutil encodes valid args correctly.
-    """
+    """Tests that gsutil encodes valid args correctly."""
     # Args other than -h and -p should be utf-8 decoded.
     args = HandleArgCoding(['ls', '-l'])
     self.assertIs(type(args[0]), unicode)
@@ -248,6 +252,7 @@
   """Integration tests for gsutil update check in command_runner module."""
 
   def setUp(self):
+    """Sets up the command runner mock objects."""
     super(TestCommandRunnerIntegrationTests, self).setUp()
 
     # Mock out the timestamp file so we can manipulate it.
@@ -260,29 +265,18 @@
     # Mock out raw_input to trigger yes prompt.
     command_runner.raw_input = lambda p: 'y'
 
-    # Create a credential-less boto config file.
-    self.orig_config = boto.config
-    config_file = path=self.CreateTempFile(
-        contents='[GSUtil]\nsoftware_update_check_period=1')
-    boto.config = Config(path=config_file)
-    # Need to copy config into boto.connection.config because it gets loaded
-    # before tests run.
-    boto.connection.config = boto.config
-    self.command_runner = command_runner.CommandRunner(config_file)
-
   def tearDown(self):
+    """Tears down the command runner mock objects."""
     super(TestCommandRunnerIntegrationTests, self).tearDown()
-
     command_runner.LAST_CHECKED_FOR_GSUTIL_UPDATE_TIMESTAMP_FILE = (
         self.previous_update_file)
     command_runner.raw_input = raw_input
-    boto.config = self.orig_config
-    boto.connection.config = boto.config
 
+  @unittest.skipUnless(not util.HAS_GS_HOST, 'gs_host is defined in config')
   def test_lookup_version_without_credentials(self):
-    """
-    Tests that gsutil tarball version lookup works without credentials.
-    """
-    self.command_runner = command_runner.CommandRunner(config_file_list=[])
-    # Looking up software version shouldn't get auth failure exception.
-    self.command_runner.RunNamedCommand('ls', [GSUTIL_PUB_TARBALL])
+    """Tests that gsutil tarball version lookup works without credentials."""
+    with SetBotoConfigFileForTest(self.CreateTempFile(
+        contents='[GSUtil]\nsoftware_update_check_period=1')):
+      self.command_runner = command_runner.CommandRunner()
+      # Looking up software version shouldn't get auth failure exception.
+      self.command_runner.RunNamedCommand('ls', [GSUTIL_PUB_TARBALL])