Switch run_isolated.py to use a constant path 'ir'.

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 155 matching lines @@
     def get_storage(_isolate_server, _namespace):
       return StorageFake({isolated_hash:isolated})
     self.mock(isolateserver, 'get_storage', get_storage)
 
     cmd = [
         '--no-log',
         '--isolated', isolated_hash,
         '--cache', self.tempdir,
         '--named-cache-root', os.path.join(self.tempdir, 'c'),
         '--isolate-server', 'https://localhost',
+        '--root-dir', self.tempdir,
     ]
     ret = run_isolated.main(cmd)
     self.assertEqual(0, ret)
     self.assertEqual(
         [([self.temp_join(u'foo.exe'), u'cmd with space'], {'detached': True})],
         self.popen_calls)
 
   def test_main_args(self):
     self.mock(tools, 'disable_buffering', lambda: None)
     isolated = json_dumps({'command': ['foo.exe', 'cmd w/ space']})
     isolated_hash = isolateserver_mock.hash_content(isolated)
     def get_storage(_isolate_server, _namespace):
       return StorageFake({isolated_hash:isolated})
     self.mock(isolateserver, 'get_storage', get_storage)
 
     cmd = [
         '--use-symlinks',
         '--no-log',
         '--isolated', isolated_hash,
         '--cache', self.tempdir,
         '--isolate-server', 'https://localhost',
         '--named-cache-root', os.path.join(self.tempdir, 'c'),
+        '--root-dir', self.tempdir,
         '--',
         '--extraargs',
         'bar',
     ]
     ret = run_isolated.main(cmd)
     self.assertEqual(0, ret)
     self.assertEqual(
         [
           ([self.temp_join(u'foo.exe'), u'cmd w/ space', '--extraargs', 'bar'],
             {'detached': True}),
@@ skipping 120 matching lines @@
     def get_storage(_isolate_server, _namespace):
       return StorageFake({isolated_hash:isolated})
     self.mock(isolateserver, 'get_storage', get_storage)
 
     cmd = [
         '--no-log',
         '--isolated', isolated_hash,
         '--cache', self.tempdir,
         '--isolate-server', 'https://localhost',
         '--named-cache-root', os.path.join(self.tempdir, 'c'),
+        '--root-dir', self.tempdir,
     ]
     ret = run_isolated.main(cmd)
     self.assertEqual(1, ret)
     self.assertEqual(1, len(self.popen_calls))
     self.assertEqual(
         [([self.temp_join(u'invalid'), u'command'], {'detached': True})],
         self.popen_calls)
 
   def test_main_naked_without_isolated(self):
     self.mock_popen_with_oserr()
@@ skipping 430 matching lines @@
     self.mock(isolateserver, 'get_storage', get_storage)
 
     out = os.path.join(self.tempdir, 'res.json')
     cmd = [
         '--no-log',
         '--isolated', isolated_in_hash,
         '--cache', self.tempdir,
         '--isolate-server', 'https://localhost:1',
         '--named-cache-root', os.path.join(self.tempdir, 'c'),
         '--json', out,
+        '--root-dir', self.tempdir,
     ]
     ret = run_isolated.main(cmd)
     self.assertEqual(0, ret)
     # Replace ${ISOLATED_OUTDIR} with the temporary directory.
     sub_cmd[2] = self.popen_calls[0][0][2]
     self.assertNotIn('ISOLATED_OUTDIR', sub_cmd[2])
     self.assertEqual([(sub_cmd, {'detached': True})], self.popen_calls)
     isolated_out = {
       'algo': 'sha-1',
       'files': {
@@ skipping 48 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()