Pass args in file from task_runner to run_isolated

appengine/swarming/swarming_bot/bot_code/task_runner_test.py

 #!/usr/bin/env python
 # coding=utf-8
 # 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.
 
 import base64
 import json
 import logging
 import os
@@ skipping 345 matching lines @@
           u'namespace': u'default-gzip',
         })
     task_details = self.get_task_details(isolated={
       'input': '123',
       'server': 'localhost:1',
       'namespace': 'default-gzip',
     }, extra_args=['foo', 'bar'])
     # Mock running run_isolated with a script.
     SCRIPT_ISOLATED = (
       'import json, sys;\n'
-      'if len(sys.argv) != 2:\n'
-      '  raise Exception(sys.argv);\n'
-      'with open(sys.argv[1], \'wb\') as f:\n'
+      'args = []\n'
+      'if len(sys.argv) != 3 or sys.argv[1] != \'-f\':\n'
+      '  raise Exception(sys.argv)\n'
+      'with open(sys.argv[2], \'r\') as argsfile:\n'
+      '  args = json.loads(argsfile.read())\n'
+      'if len(args) != 1:\n'
+      '  raise Exception(args);\n'
+      'with open(args[0], \'wb\') as f:\n'
       '  json.dump({\n'
       '    \'exit_code\': 0,\n'
       '    \'had_hard_timeout\': False,\n'
       '    \'internal_failure\': None,\n'
       '    \'outputs_ref\': {\n'
       '      \'isolated\': \'123\',\n'
       '      \'isolatedserver\': \'http://localhost:1\',\n'
       '       \'namespace\': \'default-gzip\',\n'
       '    },\n'
       '  }, f)\n'
       'sys.stdout.write(\'hi\\n\')')
     self.mock(
-        task_runner, 'get_isolated_cmd',
+        task_runner, 'get_run_isolated',
+        lambda :
+          [sys.executable, '-u', '-c', SCRIPT_ISOLATED])
+    self.mock(
+        task_runner, 'get_isolated_args',
         lambda _work_dir, _details, isolated_result, bot_file, min_free_space:
-          [sys.executable, '-u', '-c', SCRIPT_ISOLATED, isolated_result])
+          [isolated_result])
     expected = {
       u'exit_code': 0,
       u'hard_timeout': False,
       u'io_timeout': False,
       u'must_signal_internal_failure': None,
       u'version': task_runner.OUT_VERSION,
     }
     self.assertEqual(expected, self._run_command(task_details))
 
   def test_run_command_fail(self):
@@ skipping 687 matching lines @@
       server.close()
 
 
 class TaskRunnerSmoke(unittest.TestCase):
   # Runs a real process and a real Swarming fake server.
   def setUp(self):
     super(TaskRunnerSmoke, self).setUp()
     self.root_dir = tempfile.mkdtemp(prefix='task_runner')
     logging.info('Temp: %s', self.root_dir)
     self._server = fake_swarming.Server(self)
+    self.maxDiff = None

[M-A Ruel, 2016/10/21 20:15:20]

Remove, you just have to pass -v on the command line if you want to disable
maxDiff.

[aludwin, 2016/10/21 20:32:00]

Yeesh. Would have been nice if someone said that on the internet!

Of course, I'd forgotten to take this one out.

 
   def tearDown(self):
     try:
       self._server.shutdown()
     finally:
       try:
         file_path.rmtree(self.root_dir)
       except OSError:
         print >> sys.stderr, 'Failed to delete %s' % self.root_dir
       finally:
@@ skipping 93 matching lines @@
   fix_encoding.fix_encoding()
   if '-v' in sys.argv:
     unittest.TestCase.maxDiff = None
   logging_utils.prepare_logging(None)
   logging_utils.set_console_level(
       logging.DEBUG if '-v' in sys.argv else logging.CRITICAL+1)
   # Fix litteral text expectation.
   os.environ['LANG'] = 'en_US.UTF-8'
   os.environ['LANGUAGE'] = 'en_US.UTF-8'
   unittest.main()