Roll version of gsutil to 4.15.

third_party/gsutil/gslib/tests/testcase/unit_testcase.py

 # -*- coding: utf-8 -*-
 # Copyright 2013 Google Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
@@ skipping 115 matching lines @@
     if self.is_debugging and stderr:
       sys.stderr.write('==== stderr %s ====\n' % self.id())
       sys.stderr.write(stderr)
       sys.stderr.write('==== end stderr ====\n')
     if self.is_debugging and log_output:
       sys.stderr.write('==== log output %s ====\n' % self.id())
       sys.stderr.write(log_output)
       sys.stderr.write('==== end log output ====\n')
 
   def RunCommand(self, command_name, args=None, headers=None, debug=0,
-                 test_method=None, return_stdout=False, return_stderr=False,
+                 return_stdout=False, return_stderr=False,
                  return_log_handler=False, cwd=None):
     """Method for calling gslib.command_runner.CommandRunner.
 
     Passes parallel_operations=False for all tests, optionally saving/returning
     stdout output. We run all tests multi-threaded, to exercise those more
     complicated code paths.
     TODO: Change to run with parallel_operations=True for all tests. At
     present when you do this it causes many test failures.
 
     Args:
       command_name: The name of the command being run.
       args: Command-line args (arg0 = actual arg, not command name ala bash).
       headers: Dictionary containing optional HTTP headers to pass to boto.
       debug: Debug level to pass in to boto connection (range 0..3).
-      test_method: Optional general purpose method for testing purposes.
-                   Application and semantics of this method will vary by
-                   command and test type.
       return_stdout: If True, will save and return stdout produced by command.
       return_stderr: If True, will save and return stderr produced by command.
       return_log_handler: If True, will return a MockLoggingHandler instance
            that was attached to the command's logger while running.
       cwd: The working directory that should be switched to before running the
            command. The working directory will be reset back to its original
            value after running the command. If not specified, the working
            directory is left unchanged.
 
     Returns:
@@ skipping 22 matching lines @@
     sys.stdout.truncate()
     sys.stderr.truncate()
 
     mock_log_handler = MockLoggingHandler()
     logging.getLogger(command_name).addHandler(mock_log_handler)
 
     try:
       with WorkingDirectory(cwd):
         self.command_runner.RunNamedCommand(
             command_name, args=args, headers=headers, debug=debug,
-            parallel_operations=False, test_method=test_method,
-            do_shutdown=False)
+            parallel_operations=False, do_shutdown=False)
     finally:
       sys.stdout.seek(0)
       stdout = sys.stdout.read()
       sys.stderr.seek(0)
       stderr = sys.stderr.read()
       logging.getLogger(command_name).removeHandler(mock_log_handler)
       mock_log_handler.close()
 
       log_output = '\n'.join(
           '%s:\n  ' % level + '\n  '.join(records)
@@ skipping 151 matching lines @@
 
     Returns:
       A StorageUri for the created object.
     """
     bucket_uri = bucket_uri or self.CreateBucket()
     object_name = object_name or self.MakeTempName('obj')
     key_uri = bucket_uri.clone_replace_name(object_name)
     if contents is not None:
       key_uri.set_contents_from_string(contents)
     return key_uri