Add option to collapse symlinks in isolate.py

client/tests/isolated_format_test.py

 #!/usr/bin/env python
 # Copyright 2014 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 hashlib
 import json
 import logging
 import os
 import sys
@@ skipping 71 matching lines @@
       ]
       self.assertEqual(expected, actual)
 
     def test_file_to_metadata_path_case_simple(self):
       # Ensure the symlink dest is saved in the right path case.
       subdir = os.path.join(self.cwd, 'subdir')
       os.mkdir(subdir)
       linkdir = os.path.join(self.cwd, 'linkdir')
       os.symlink('subDir', linkdir)
       actual = isolated_format.file_to_metadata(
-          unicode(linkdir.upper()), {}, True, ALGO)
+          unicode(linkdir.upper()), {}, True, ALGO, False)
       expected = {'l': u'subdir', 't': int(os.stat(linkdir).st_mtime)}
       self.assertEqual(expected, actual)
 
     def test_file_to_metadata_path_case_complex(self):
       # Ensure the symlink dest is saved in the right path case. This includes 2
       # layers of symlinks.
       basedir = os.path.join(self.cwd, 'basebir')
       os.mkdir(basedir)
 
       linkeddir2 = os.path.join(self.cwd, 'linkeddir2')
       os.mkdir(linkeddir2)
 
       linkeddir1 = os.path.join(basedir, 'linkeddir1')
       os.symlink('../linkedDir2', linkeddir1)
 
       subsymlinkdir = os.path.join(basedir, 'symlinkdir')
       os.symlink('linkedDir1', subsymlinkdir)
 
       actual = isolated_format.file_to_metadata(
-          unicode(subsymlinkdir.upper()), {}, True, ALGO)
+          unicode(subsymlinkdir.upper()), {}, True, ALGO, False)
       expected = {
         'l': u'linkeddir1', 't': int(os.stat(subsymlinkdir).st_mtime),
       }
       self.assertEqual(expected, actual)
 
       actual = isolated_format.file_to_metadata(
-          unicode(linkeddir1.upper()), {}, True, ALGO)
+          unicode(linkeddir1.upper()), {}, True, ALGO, False)
       expected = {
         'l': u'../linkeddir2', 't': int(os.stat(linkeddir1).st_mtime),
       }
       self.assertEqual(expected, actual)
 
   if sys.platform != 'win32':
     def test_symlink_input_absolute_path(self):
       # A symlink is outside of the checkout, it should be treated as a normal
       # directory.
       # .../src
       # .../src/out -> .../tmp/foo
       # .../tmp
       # .../tmp/foo
       src = os.path.join(self.cwd, u'src')
       src_out = os.path.join(src, 'out')
       tmp = os.path.join(self.cwd, 'tmp')
       tmp_foo = os.path.join(tmp, 'foo')
       os.mkdir(src)
       os.mkdir(tmp)
       os.mkdir(tmp_foo)
       # The problem was that it's an absolute path, so it must be considered a
       # normal directory.
       os.symlink(tmp, src_out)
       open(os.path.join(tmp_foo, 'bar.txt'), 'w').close()
       actual = isolated_format.expand_symlinks(src, u'out/foo/bar.txt')
       self.assertEqual((u'out/foo/bar.txt', []), actual)
 
+    def test_file_to_metadata_path_case_collapse(self):
+      # Ensure setting the collapse_symlink option doesn't include the symlinks
+      basedir = os.path.join(self.cwd, 'basedir')
+      os.mkdir(basedir)
+      subdir = os.path.join(basedir, 'subdir')
+      os.mkdir(subdir)
+      linkdir = os.path.join(basedir, 'linkdir')
+      os.mkdir(linkdir)
+
+      foo_file = os.path.join(subdir, 'Foo.txt')
+      open(foo_file, 'w').close()
+      sym_file = os.path.join(basedir, 'linkdir', 'Sym.txt')
+      os.symlink('../subdir/Foo.txt', sym_file)
+
+      actual = isolated_format.file_to_metadata(sym_file, {}, True, ALGO, True)
+
+      expected = {
+        # SHA-1 of empty string
+        'h': 'da39a3ee5e6b4b0d3255bfef95601890afd80709',
+        'm': 288,
+        's': 0,
+        't': int(round(os.stat(foo_file).st_mtime)),
+      }
+      self.assertEqual(expected, actual)
+
 
 class TestIsolated(auto_stub.TestCase):
   def test_load_isolated_empty(self):
     m = isolated_format.load_isolated('{}', isolateserver_mock.ALGO)
     self.assertEqual({}, m)
 
   def test_load_isolated_good(self):
     data = {
       u'command': [u'foo', u'bar'],
       u'files': {
@@ skipping 92 matching lines @@
     self.assertEqual([('foo', data, True)], calls)
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   if '-v' in sys.argv:
     unittest.TestCase.maxDiff = None
   logging.basicConfig(
       level=(logging.DEBUG if '-v' in sys.argv else logging.ERROR))
   unittest.main()