Migrate and merge logging_utils from swarming_bot into client/utils.

client/tests/isolate_test.py

 #!/usr/bin/env python
 # Copyright 2012 The Swarming Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0 that
 # can be found in the LICENSE file.
 
 import cStringIO
 import hashlib
 import json
 import logging
 import optparse
 import os
 import shutil
 import subprocess
 import sys
 import tempfile
 
 ROOT_DIR = unicode(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 sys.path.insert(0, ROOT_DIR)
 sys.path.insert(0, os.path.join(ROOT_DIR, 'third_party'))
 
 from depot_tools import auto_stub
 import auth
 import isolate
 import isolate_format
 import isolated_format
 import isolateserver
 from utils import file_path
+from utils import logging_utils
 from utils import tools
 import test_utils
 
 ALGO = hashlib.sha1
 
 
 NO_RUN_ISOLATE = {
   'tests/isolate/files1/subdir/42.txt':
       'the answer to life the universe and everything\n',
   'tests/isolate/files1/test_file1.txt': 'Foo\n',
@@ skipping 58 matching lines @@
 
 class IsolateBase(auto_stub.TestCase):
   def setUp(self):
     super(IsolateBase, self).setUp()
     self.mock(auth, 'ensure_logged_in', lambda _: None)
     self.old_cwd = os.getcwd()
     self.cwd = file_path.get_native_path_case(
         unicode(tempfile.mkdtemp(prefix=u'isolate_')))
     # Everything should work even from another directory.
     os.chdir(self.cwd)
+    self.mock(
+        logging_utils.OptionParserWithLogging, 'logger_root',
+        logging.Logger('unittest'))
 
   def tearDown(self):
     try:
       os.chdir(self.old_cwd)
       file_path.rmtree(self.cwd)
     finally:
       super(IsolateBase, self).tearDown()
 
 
 class IsolateTest(IsolateBase):
@@ skipping 1253 matching lines @@
       }, f)
 
     self.mock(sys, 'stdout', cStringIO.StringIO())
     cmd = [
       '--isolate-server', 'http://localhost:1',
       '--dump-json', 'json_output.json',
       join('x.isolated.gen.json'),
       join('y.isolated.gen.json'),
     ]
     self.assertEqual(
-        0, isolate.CMDbatcharchive(tools.OptionParserWithLogging(), cmd))
+        0,
+        isolate.CMDbatcharchive(logging_utils.OptionParserWithLogging(), cmd))
     expected = [
         {
           'base_url': 'http://localhost:1',
           'infiles': {
             join(isolated_file_x): {
               'priority': '0',
             },
             join('foo'): {
               'h': '520d41b29f891bbaccf31d9fcfa72e82ea20fcf0',
               's': 4,
@@ skipping 219 matching lines @@
 
 
 def clear_env_vars():
   for e in ('ISOLATE_DEBUG', 'ISOLATE_SERVER'):
     os.environ.pop(e, None)
 
 
 if __name__ == '__main__':
   clear_env_vars()
   test_utils.main()