Move file path functions into utils/file_path.py.

tests/isolate_test.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.
 
 import cStringIO
 import hashlib
 import json
 import logging
 import os
 import sys
 import tempfile
 import unittest
 
 import auto_stub
 
 ROOT_DIR = unicode(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 sys.path.insert(0, ROOT_DIR)
 
 import isolate
+from utils import file_path
 # Create shortcuts.
 from isolate import KEY_TOUCHED, KEY_TRACKED, KEY_UNTRACKED
 
 
 ALGO = hashlib.sha1
 
 
 def _size(*args):
   return os.stat(os.path.join(ROOT_DIR, *args)).st_size
 
@@ skipping 1137 matching lines @@
           'h': hash_file('tests', 'isolate', 'touch_root.py'),
           's': _size('tests', 'isolate', 'touch_root.py'),
         },
         u'isolate.py': {
           'm': 488,
           'h': hash_file('isolate.py'),
           's': _size('isolate.py'),
         },
       },
       'isolate_file': isolate.safe_relpath(
-          isolate.trace_inputs.get_native_path_case(isolate_file),
+          file_path.get_native_path_case(isolate_file),
           os.path.dirname(options.isolated)),
       'relative_cwd': os.path.join(u'tests', 'isolate'),
       'variables': {
         'foo': 'bar',
         'OS': isolate.get_flavor(),
         'chromeos': options.variables['chromeos'],
       },
       'version': '1.0',
     }
     self._cleanup_isolated(expected_saved_state)
@@ skipping 35 matching lines @@
       'child_isolated_files': [],
       'command': ['python', 'touch_root.py'],
       'files': {
         os.path.join(u'tests', 'isolate', 'touch_root.py'): {
           'm': 488,
           'h': hash_file('tests', 'isolate', 'touch_root.py'),
           's': _size('tests', 'isolate', 'touch_root.py'),
         },
       },
       'isolate_file': isolate.safe_relpath(
-          isolate.trace_inputs.get_native_path_case(isolate_file),
+          file_path.get_native_path_case(isolate_file),
           os.path.dirname(options.isolated)),
       'relative_cwd': os.path.join(u'tests', 'isolate'),
       'variables': {
         'foo': 'bar',
         'OS': isolate.get_flavor(),
         'chromeos': chromeos_value,
       },
       'version': '1.0',
     }
     self._cleanup_isolated(expected_saved_state)
@@ skipping 36 matching lines @@
       'child_isolated_files': [],
       'command': ['python', 'touch_root.py'],
       'files': {
         os.path.join(u'tests', 'isolate', 'touch_root.py'): {
           'm': 488,
           'h': hash_file('tests', 'isolate', 'touch_root.py'),
           's': _size('tests', 'isolate', 'touch_root.py'),
         },
       },
       'isolate_file': isolate.safe_relpath(
-          isolate.trace_inputs.get_native_path_case(isolate_file),
+          file_path.get_native_path_case(isolate_file),
           os.path.dirname(options.isolated)),
       'relative_cwd': os.path.join(u'tests', 'isolate'),
       'variables': {
         'foo': 'bar',
         'BAZ': os.path.join('tests', 'isolate'),
         'OS': isolate.get_flavor(),
         'chromeos': chromeos_value,
       },
       'version': '1.0',
     }
     self._cleanup_isolated(expected_saved_state)
     self._cleanup_saved_state(actual_saved_state)
     self.assertEqual(expected_saved_state, actual_saved_state)
 
   def test_variable_not_exist(self):
     isolate_file = os.path.join(
         ROOT_DIR, 'tests', 'isolate', 'touch_root.isolate')
     options = self._get_option(isolate_file)
     options.variables['PRODUCT_DIR'] = os.path.join(u'tests', u'isolate')
-    native_cwd = isolate.trace_inputs.get_native_path_case(unicode(self.cwd))
+    native_cwd = file_path.get_native_path_case(unicode(self.cwd))
     try:
       isolate.load_complete_state(options, self.cwd, None, False)
       self.fail()
     except isolate.ExecutionError, e:
       self.assertEqual(
           'PRODUCT_DIR=%s is not a directory' %
             os.path.join(native_cwd, 'tests', 'isolate'),
           e.args[0])
 
   def test_variable(self):
@@ skipping 39 matching lines @@
           'h': hash_file('isolate.py'),
           's': _size('isolate.py'),
         },
         os.path.join(u'tests', 'isolate', 'touch_root.py'): {
           'm': 488,
           'h': hash_file('tests', 'isolate', 'touch_root.py'),
           's': _size('tests', 'isolate', 'touch_root.py'),
         },
       },
       'isolate_file': isolate.safe_relpath(
-          isolate.trace_inputs.get_native_path_case(isolate_file),
+          file_path.get_native_path_case(isolate_file),
           os.path.dirname(options.isolated)),
       'relative_cwd': os.path.join(u'tests', 'isolate'),
       'variables': {
         'foo': 'bar',
         'PRODUCT_DIR': '.',
         'OS': isolate.get_flavor(),
         'chromeos': chromeos_value,
       },
       'version': '1.0',
     }
@@ skipping 74 matching lines @@
           'h': hash_file('tests', 'isolate', 'files1', 'test_file2.txt'),
           's': _size('tests', 'isolate', 'files1', 'test_file2.txt'),
         },
         os.path.join(u'tests', 'isolate', 'no_run.isolate'): {
           'm': 416,
           'h': hash_file('tests', 'isolate', 'no_run.isolate'),
           's': _size('tests', 'isolate', 'no_run.isolate'),
         },
       },
       'isolate_file': isolate.safe_relpath(
-          isolate.trace_inputs.get_native_path_case(isolate_file),
+          file_path.get_native_path_case(isolate_file),
           os.path.dirname(options.isolated)),
       'relative_cwd': os.path.join(u'tests', 'isolate'),
       'variables': {
         'foo': 'bar',
         'PRODUCT_DIR': os.path.join(u'..', '..', 'third_party'),
         'OS': isolate.get_flavor(),
         'chromeos': chromeos_value,
       },
       'version': '1.0',
     }
@@ skipping 99 matching lines @@
           u's': _size('tests', 'isolate', 'split.py'),
         },
         os.path.join(u'test', 'data', 'foo.txt'): {
           u'm': 416,
           u'h': unicode(
               hash_file('tests', 'isolate', 'test', 'data', 'foo.txt')),
           u's': _size('tests', 'isolate', 'test', 'data', 'foo.txt'),
         },
       },
       u'isolate_file': isolate.safe_relpath(
-          isolate.trace_inputs.get_native_path_case(isolate_file),
+          file_path.get_native_path_case(isolate_file),
           unicode(os.path.dirname(options.isolated))),
       u'relative_cwd': u'.',
       u'variables': {
         u'OS': unicode(isolate.get_flavor()),
         u'DEPTH': u'.',
         u'PRODUCT_DIR': u'files1',
       },
       u'version': u'1.0',
     }
     self._cleanup_isolated(expected_saved_state)
@@ skipping 89 matching lines @@
     self.assertEqual(0, isolate.CMDrun(isolate.OptionParserIsolate(), cmd))
 
 
 if __name__ == '__main__':
   logging.basicConfig(
       level=logging.DEBUG if '-v' in sys.argv else logging.ERROR,
       format='%(levelname)5s %(filename)15s(%(lineno)3d): %(message)s')
   if '-v' in sys.argv:
     unittest.TestCase.maxDiff = None
   unittest.main()