swarming: change meaning of inputs_ref

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 by the Apache v2.0 license that can be
 # found in the LICENSE file.
 
 import base64
 import json
 import logging
 import os
@@ skipping 20 matching lines @@
 import fake_swarming
 import task_runner
 
 CLIENT_DIR = os.path.normpath(
     os.path.join(test_env_bot_code.BOT_DIR, '..', '..', '..', 'client'))
 
 sys.path.insert(0, os.path.join(CLIENT_DIR, 'tests'))
 import isolateserver_mock
 
 
-def get_manifest(script=None, inputs_ref=None, **kwargs):
+def get_manifest(script=None, isolated=None, **kwargs):
+  isolated_input = isolated and isolated.get('input')
   out = {
     'bot_id': 'localhost',
     'command':
-        [sys.executable, '-u', '-c', script] if not inputs_ref else None,
+        [sys.executable, '-u', '-c', script] if not isolated_input else None,
     'env': {},
     'extra_args': [],
     'grace_period': 30.,
     'hard_timeout': 10.,
-    'inputs_ref': inputs_ref,
     'io_timeout': 10.,
+    'isolated': isolated,
     'task_id': 23,
   }
   out.update(kwargs)
   return out
 
 
 class TestTaskRunnerBase(net_utils.TestCase):
   def setUp(self):
     super(TestTaskRunnerBase, self).setUp()
     self.root_dir = tempfile.mkdtemp(prefix='task_runner')
@@ skipping 113 matching lines @@
 
     manifest = os.path.join(self.root_dir, 'manifest')
     with open(manifest, 'wb') as f:
       data = {
         'bot_id': 'localhost',
         'command': ['a'],
         'env': {'d': 'e'},
         'extra_args': [],
         'grace_period': 30.,
         'hard_timeout': 10,
-        'inputs_ref': None,
         'io_timeout': 11,
+        'isolated': None,
         'task_id': 23,
       }
       json.dump(data, f)
 
     out_file = os.path.join(self.root_dir, 'work', 'task_runner_out.json')
     task_runner.load_and_run(manifest, server, 3600., time.time(), out_file, 1)
     expected = {
       u'exit_code': 1,
       u'hard_timeout': False,
       u'io_timeout': False,
@@ skipping 30 matching lines @@
     manifest = os.path.join(self.root_dir, 'manifest')
     with open(manifest, 'wb') as f:
       data = {
         'bot_id': 'localhost',
         'command': None,
         'env': {'d': 'e'},
         'extra_args': ['foo', 'bar'],
         'grace_period': 30.,
         'hard_timeout': 10,
         'io_timeout': 11,
-        'inputs_ref': {
-          'isolated': '123',
-          'isolatedserver': 'http://localhost:1',
+        'isolated': {
+          'input': '123',
+          'server': 'http://localhost:1',
           'namespace': 'default-gzip',
         },
         'task_id': 23,
       }
       json.dump(data, f)
 
     out_file = os.path.join(self.root_dir, 'work', 'task_runner_out.json')
     task_runner.load_and_run(manifest, server, 3600., time.time(), out_file, 1)
     expected = {
       u'exit_code': 0,
@@ skipping 20 matching lines @@
 
   def test_run_command_isolated(self):
     # This runs the command for real.
     self.requests(
         cost_usd=1, exit_code=0,
         outputs_ref={
           u'isolated': u'123',
           u'isolatedserver': u'http://localhost:1',
           u'namespace': u'default-gzip',
         })
-    task_details = self.get_task_details(inputs_ref={
-      'isolated': '123',
-      'isolatedserver': 'localhost:1',
+    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'
       '  json.dump({\n'
       '    \'exit_code\': 0,\n'
@@ skipping 49 matching lines @@
         {
           'bot_id': 'localhost',
           'command': [
             'executable_that_shouldnt_be_on_your_system',
             'thus_raising_OSError',
           ],
           'env': {},
           'extra_args': [],
           'grace_period': 30.,
           'hard_timeout': 6,
-          'inputs_ref': None,
           'io_timeout': 6,
+          'isolated': None,
           'task_id': 23,
         })
     expected = {
       u'exit_code': -1,
       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))
@@ skipping 87 matching lines @@
     ]
     self.expected_requests(requests)
     task_details = task_runner.TaskDetails(
         {
           'bot_id': 'localhost',
           'command': ['large', 'executable'],
           'env': {'foo': 'bar'},
           'extra_args': [],
           'grace_period': 30.,
           'hard_timeout': 60,
-          'inputs_ref': None,
           'io_timeout': 60,
+          'isolated': None,
           'task_id': 23,
         })
     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))
@@ skipping 343 matching lines @@
         'command': ['python', 'parent.py'],
         'files': {
           name: {
             'h': server.add_content_compressed('default-gzip', content),
             's': len(content),
           } for name, content in files.iteritems()
         },
       })
       isolated_digest = server.add_content_compressed('default-gzip', isolated)
       manifest = get_manifest(
-          inputs_ref={
-            'isolated': isolated_digest,
+          isolated={
+            'input': isolated_digest,
             'namespace': 'default-gzip',
-            'isolatedserver': server.url,
+            'server': server.url,
           })
       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._load_and_run(manifest))
     finally:
@@ skipping 98 matching lines @@
         'files': {
           name: {
             'h': server.add_content_compressed('default-gzip', content),
             's': len(content),
           } for name, content in files.iteritems()
         },
       })
       isolated_digest = server.add_content_compressed('default-gzip', isolated)
       try:
         manifest = get_manifest(
-            inputs_ref={
-              'isolated': isolated_digest,
+            isolated={
+              'input': isolated_digest,
               'namespace': 'default-gzip',
-              'isolatedserver': server.url,
+              'server': server.url,
             },
             # TODO(maruel): A bit cheezy, we'd want the I/O timeout to be just
             # enough to have the time for the PID to be printed but not more.
             io_timeout=1,
             grace_period=self.SHORT_TIME_OUT)
         expected = {
           u'exit_code': exit_code,
           u'hard_timeout': False,
           u'io_timeout': True,
           u'must_signal_internal_failure': None,
@@ skipping 133 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()