Return named output files if they're symlinks

client/tests/run_isolated_test.py

 #!/usr/bin/env python
 # Copyright 2013 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.
 
 # pylint: disable=R0201
 
 import StringIO
 import base64
 import contextlib
@@ skipping 757 matching lines @@
 
 
 # Like RunIsolatedTestRun, but ensures that specific output files
 # (as opposed to anything in $(ISOLATED_OUTDIR)) are returned.
 class RunIsolatedTestOutputFiles(RunIsolatedTestBase):
   def _run_test(self, isolated, command):
     # Starts a full isolate server mock and have run_tha_test() uploads results
     # back after the task completed.
     server = isolateserver_mock.MockIsolateServer()
     try:
+      # Output two files. If we're on Linux, we'll try to make one of them a
+      # symlink to ensure that we correctly follow symlinks. Note that this only
+      # tests file symlinks, not directory symlinks.
+      # TODO(aludwin): follow directory symlinks
       script = (
         'import sys\n'
+        'import os\n'

[M-A Ruel, 2017/06/09 20:16:22]

OMG it's not sorted.

[aludwin, 2017/06/12 12:59:11]

Done.

         'open(sys.argv[1], "w").write("bar")\n'
-        'open(sys.argv[2], "w").write("baz")\n')
+        'if sys.platform.startswith("linux"):\n'
+        '  realpath = os.path.join(os.getcwd(), "contents_of_symlink")\n'

[M-A Ruel, 2017/06/09 20:16:22]

realpath = os.path.abspath("contents_of_symlink")
but strictly speaking, it is not necessary as a relative path would be just
fine.

[aludwin, 2017/06/12 12:59:11]

Fixed. Because "sys.argv[2]" can be in another directory (and is, in this test),
we need an absolute path here, not a relative one.

+        '  open(realpath, "w").write("baz")\n'
+        '  os.symlink(realpath, sys.argv[2])\n'
+        'else:\n'
+        '  open(sys.argv[2], "w").write("baz")\n')
       script_hash = isolateserver_mock.hash_content(script)
       isolated['files']['cmd.py'] = {
         'h': script_hash,
         'm': 0700,
         's': len(script),
       }
       if sys.platform == 'win32':
         isolated['files']['cmd.py'].pop('m')
       isolated_data = json_dumps(isolated)
       isolated_hash = isolateserver_mock.hash_content(isolated_data)
@@ skipping 203 matching lines @@
     self.assertEqual(expected, actual)
 
 
 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()