Move file path functions into utils/file_path.py.

tests/isolate_smoke_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 re
 import shutil
 import stat
 import subprocess
 import sys
 import tempfile
 import unittest
 
 ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 sys.path.insert(0, ROOT_DIR)
 
 import isolate
 import isolateserver
+from utils import file_path
 
 
 VERBOSE = False
 
 ALGO = hashlib.sha1
 HASH_NULL = ALGO().hexdigest()
 
 
 # Keep the list hard coded.
 EXPECTED_MODES = (
@@ skipping 224 matching lines @@
 
   def _expected_saved_state(self, args, read_only, empty_file, extra_vars):
     flavor = isolate.get_flavor()
     chromeos_value = int(flavor == 'linux')
     expected = {
       u'algo': u'sha-1',
       u'child_isolated_files': [],
       u'command': [],
       u'files': self._gen_files(read_only, empty_file, True),
       u'isolate_file': isolate.safe_relpath(
-          isolate.trace_inputs.get_native_path_case(unicode(self.filename())),
+          file_path.get_native_path_case(unicode(self.filename())),
           unicode(os.path.dirname(self.isolated))),
       u'relative_cwd': unicode(RELATIVE_CWD[self.case()]),
       u'variables': {
         u'EXECUTABLE_SUFFIX': u'.exe' if flavor == 'win' else u'',
         u'OS': unicode(flavor),
         u'chromeos': chromeos_value,
       },
       u'version': u'1.0',
     }
     if args:
@@ skipping 75 matching lines @@
 
   def _test_missing_trailing_slash(self, mode):
     try:
       self._execute(mode, 'missing_trailing_slash.isolate', [], True)
       self.fail()
     except subprocess.CalledProcessError as e:
       self.assertEqual('', e.output)
       out = e.stderr
     self._expect_no_tree()
     self._expect_no_result()
-    root = isolate.trace_inputs.get_native_path_case(unicode(ROOT_DIR))
+    root = file_path.get_native_path_case(unicode(ROOT_DIR))
     expected = (
       '\n'
       'Error: Input directory %s must have a trailing slash\n' %
           os.path.join(root, 'tests', 'isolate', 'files1')
     )
     self.assertEqual(expected, out)
 
   def _test_non_existent(self, mode):
     try:
       self._execute(mode, 'non_existent.isolate', [], True)
       self.fail()
     except subprocess.CalledProcessError as e:
       self.assertEqual('', e.output)
       out = e.stderr
     self._expect_no_tree()
     self._expect_no_result()
-    root = isolate.trace_inputs.get_native_path_case(unicode(ROOT_DIR))
+    root = file_path.get_native_path_case(unicode(ROOT_DIR))
     expected = (
       '\n'
       'Error: Input file %s doesn\'t exist\n' %
           os.path.join(root, 'tests', 'isolate', 'A_file_that_do_not_exist')
     )
     self.assertEqual(expected, out)
 
   def _test_all_items_invalid(self, mode):
     out = self._execute(mode, 'all_items_invalid.isolate',
                         ['--ignore_broken_item'], True)
@@ skipping 392 matching lines @@
       self._execute('run', 'symlink_outside_build_root.isolate', [], False)
       self._expect_empty_tree()
       self._expect_results(['symlink_outside_build_root.py'], None, None, None)
 
 
 class Isolate_trace_read_merge(IsolateModeBase):
   # Tests both trace, read and merge.
   # Warning: merge updates .isolate files. But they are currently in their
   # canonical format so they shouldn't be changed.
   def _check_merge(self, filename):
-    filepath = isolate.trace_inputs.get_native_path_case(
+    filepath = file_path.get_native_path_case(
             os.path.join(unicode(ROOT_DIR), 'tests', 'isolate', filename))
     expected = 'Updating %s\n' % isolate.safe_relpath(filepath, self.tempdir)
     with open(filepath, 'rb') as f:
       old_content = f.read()
     out = self._execute('merge', filename, [], True) or ''
     self.assertEqual(expected, out)
     with open(filepath, 'rb') as f:
       new_content = f.read()
     self.assertEqual(old_content, new_content)
 
@@ skipping 362 matching lines @@
     self.assertEqual('Simply works.\n', stdout)
     self.assertEqual(0, proc.returncode)
 
 
 if __name__ == '__main__':
   VERBOSE = '-v' in sys.argv
   logging.basicConfig(level=logging.DEBUG if VERBOSE else logging.ERROR)
   if VERBOSE:
     unittest.TestCase.maxDiff = None
   unittest.main()