Add option to collapse symlinks in isolate.py

client/tests/isolate_test.py

 #!/usr/bin/env python
 # Copyright 2012 The LUCI 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
@@ skipping 239 matching lines @@
     tools.write_json(isolate_file, isolate_content, False)
     expected = {
       'algo': 'sha-1',
       'files': {},
       'read_only': 0,
       'relative_cwd': '.',
       'version': isolated_format.ISOLATED_FILE_VERSION,
     }
     complete_state = isolate.CompleteState(None, isolate.SavedState(self.cwd))
     complete_state.load_isolate(
-        unicode(self.cwd), unicode(isolate_file), {}, {}, {}, None, False)
+        unicode(self.cwd), unicode(isolate_file), {}, {}, {}, None, False,
+        False)
     self.assertEqual(expected, complete_state.saved_state.to_isolated())
 
 
 class IsolateLoad(IsolateBase):
   def setUp(self):
     super(IsolateLoad, self).setUp()
     self.directory = tempfile.mkdtemp(prefix=u'isolate_')
     self.isolate_dir = os.path.join(self.directory, u'isolate')
     self.isolated_dir = os.path.join(self.directory, u'isolated')
     os.mkdir(self.isolated_dir, 0700)
@@ skipping 11 matching lines @@
       outdir = os.path.join(self.directory, 'outdir')
       isolate = isolate_file
       blacklist = list(isolateserver.DEFAULT_BLACKLIST)
       path_variables = {}
       config_variables = {
         'OS': 'linux',
         'chromeos': 1,
       }
       extra_variables = {'foo': 'bar'}
       ignore_broken_items = False
+      collapse_symlinks = False
     return Options()
 
   def _cleanup_isolated(self, expected_isolated):
     """Modifies isolated to remove the non-deterministic parts."""
     if sys.platform == 'win32':
       # 'm' are not saved in windows.
       for values in expected_isolated['files'].itervalues():
         self.assertTrue(values.pop('m'))
 
   def _cleanup_saved_state(self, actual_saved_state):
@@ skipping 667 matching lines @@
         base = os.path.dirname(f)
         if not os.path.isdir(base):
           os.mkdir(base)
         open(f, 'wb').close()
 
       c = isolate.CompleteState(isolated, isolate.SavedState(isolated_dir))
       config = {
         'OS': config_os,
       }
       c.load_isolate(
-          unicode(self.cwd), root_isolate, {}, config, {}, None, False)
+          unicode(self.cwd), root_isolate, {}, config, {}, None, False, False)
       # Note that load_isolate() doesn't retrieve the meta data about each file.
       expected = {
         'algo': 'sha-1',
         'command': command,
         'files': {
           unicode(f.replace('/', os.path.sep)):{} for f in expected_files
         },
         'read_only': 1,
         'relative_cwd': relative_cwd.replace('/', os.path.sep),
         'version': isolated_format.ISOLATED_FILE_VERSION,
@@ skipping 174 matching lines @@
       config = {
         'OS': config_os,
       }
       paths = {
         'PATH': 'path/',
       }
       extra = {
         'EXTRA': 'indeed',
       }
       c.load_isolate(
-          unicode(cwd), root_isolate, paths, config, extra, None, False)
+          unicode(cwd), root_isolate, paths, config, extra, None, False, False)
       # Note that load_isolate() doesn't retrieve the meta data about each file.
       expected = {
         'algo': 'sha-1',
         'command': command,
         'files': {
           unicode(os.path.join(cwd_name, config_os, 'path', f)): {}
           for f in expected_files
         },
         'read_only': 1,
         'relative_cwd': relative_cwd,
@@ skipping 434 matching lines @@
 
 def clear_env_vars():
   for e in ('ISOLATE_DEBUG', 'ISOLATE_SERVER'):
     os.environ.pop(e, None)
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   clear_env_vars()
   test_utils.main()