Move file path functions into utils/file_path.py.

googletest/tests/trace_test_cases_smoke_test.py

 #!/usr/bin/env python
 # Copyright 2013 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.
 
 import json
 import logging
 import os
 import re
 import subprocess
 import sys
 import tempfile
 import unittest
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 GOOGLETEST_DIR = os.path.dirname(BASE_DIR)
 ROOT_DIR = os.path.dirname(GOOGLETEST_DIR)
 sys.path.insert(0, ROOT_DIR)
 sys.path.insert(0, os.path.join(BASE_DIR, 'gtest_fake'))
 
-import trace_inputs
 import gtest_fake_base
+from utils import file_path
 
 FILE_PATH = os.path.realpath(unicode(os.path.abspath(__file__)))
 TARGET_UTIL_PATH = os.path.join(BASE_DIR, 'gtest_fake', 'gtest_fake_base.py')
 TARGET_PATH = os.path.join(BASE_DIR, 'gtest_fake', 'gtest_fake_fail.py')
 
 
 class TraceTestCases(unittest.TestCase):
   def setUp(self):
     self.temp_file = None
 
     self.initial_cwd = GOOGLETEST_DIR
     if sys.platform == 'win32':
       # Windows has no kernel mode concept of current working directory.
       self.initial_cwd = None
 
     # There's 2 kinds of references to python, self.executable,
     # self.real_executable. It depends how python was started and on which OS.
     self.executable = unicode(sys.executable)
     if sys.platform == 'darwin':
       # /usr/bin/python is a thunk executable that decides which version of
       # python gets executed.
       suffix = '.'.join(map(str, sys.version_info[0:2]))
       if os.access(self.executable + suffix, os.X_OK):
         # So it'll look like /usr/bin/python2.7
         self.executable += suffix
 
-    self.real_executable = trace_inputs.get_native_path_case(self.executable)
+    self.real_executable = file_path.get_native_path_case(self.executable)
     # Make sure there's no environment variable that could do side effects.
     os.environ.pop('GTEST_SHARD_INDEX', '')
     os.environ.pop('GTEST_TOTAL_SHARDS', '')
 
   def tearDown(self):
     if self.temp_file:
       os.remove(self.temp_file)
 
   def assertGreater(self, a, b, msg=None):
     """Just like self.assertTrue(a > b), but with a nicer default message.
@@ skipping 81 matching lines @@
       if sys.platform == 'win32':
         output = output.replace('\r\n', '\n')
       self.assertEqual(expected_output, output, repr(output))
 
       expected_trace = {
         u'root': {
           u'children': [],
           u'command': [
             self.executable, TARGET_PATH, '--gtest_filter=' + test_case,
           ],
-          u'executable': trace_inputs.get_native_path_case(
+          u'executable': file_path.get_native_path_case(
             unicode(self.executable)),
           u'initial_cwd': GOOGLETEST_DIR,
         },
       }
       if sys.platform == 'win32':
         expected_trace['root']['initial_cwd'] = None
       self.assertGreater(actual['trace']['root'].pop('pid'), 1)
       self.assertGreater(len(actual['trace']['root'].pop('files')), 10)
       self.assertEqual(expected_trace, actual['trace'])
 
 
 if __name__ == '__main__':
   VERBOSE = '-v' in sys.argv
   logging.basicConfig(level=logging.DEBUG if VERBOSE else logging.ERROR)
   # Necessary for the dtrace logger to work around execve() hook. See
   # trace_inputs.py for more details.
   os.environ['TRACE_INPUTS_DTRACE_ENABLE_EXECVE'] = '1'
   unittest.main()