swarming: change meaning of inputs_ref

appengine/swarming/server/task_request_test.py

 #!/usr/bin/env python
 # Copyright 2014 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 datetime
 import logging
 import os
 import random
 import sys
@@ skipping 23 matching lines @@
   return task_request.make_request(req, True)
 
 
 def _gen_request(properties=None, **kwargs):
   """Creates a TaskRequest."""
   properties = properties or {}
   packages = properties.pop('packages', [{
     'package_name': 'rm',
     'version': PINNED_PACKAGE_VERSION,
   }])
+  inputs_ref = properties.pop('inputs_ref', {
+    'isolatedserver': 'https://isolateserver.appspot.com',
+    'namespace': 'default-gzip',
+  })
   props = {
     'command': [u'command1', u'arg1'],
     'packages': [task_request.CipdPackage(**p) for p in packages],
     'dimensions': {
       u'OS': u'Windows-3.1.1',
       u'hostname': u'localhost',
       u'pool': u'default',
     },
     'env': {u'foo': u'bar', u'joe': u'2'},
     'execution_timeout_secs': 30,
     'grace_period_secs': 30,
     'idempotent': False,
+    'inputs_ref': inputs_ref,
     'io_timeout_secs': None,
   }
   props.update(properties)
   now = utils.utcnow()
   args = {
     'created_ts': now,
     'name': 'Request name',
     'priority': 50,
     'properties': task_request.TaskProperties(**props),
     'expiration_ts': now + datetime.timedelta(seconds=30),
@@ skipping 133 matching lines @@
       'dimensions': {
         u'OS': u'Windows-3.1.1',
         u'hostname': u'localhost',
         u'pool': u'default',
       },
       'env': {u'foo': u'bar', u'joe': u'2'},
       'extra_args': [],
       'execution_timeout_secs': 30,
       'grace_period_secs': 30,
       'idempotent': True,
-      'inputs_ref': None,
+      'inputs_ref': {
+        'isolated': None,
+        'isolatedserver': 'https://isolateserver.appspot.com',
+        'namespace': 'default-gzip',
+      },
       'io_timeout_secs': None,
       'packages': [{'package_name': 'rm', 'version': PINNED_PACKAGE_VERSION}],
     }
     expected_request = {
       'authenticated': auth_testing.DEFAULT_MOCKED_IDENTITY,
       'name': u'Request name',
       'parent_task_id': unicode(parent_id),
       'priority': 49,
       'properties': expected_properties,
       # Intentionally hard code the hash value since it has to be deterministic.
       # Other unit tests should use the calculated value.
-      'properties_hash': '83b350298f05eff6072d54d2c6f031d06cc30449',
+      'properties_hash': 'c3e067b4e232be5478e7147bb1f0506477444014',
       'pubsub_topic': None,
       'pubsub_userdata': None,
       'tags': [
         u'OS:Windows-3.1.1',
         u'hostname:localhost',
         u'pool:default',
         u'priority:49',
         u'tag:1',
         u'user:Jesus',
       ],
@@ skipping 23 matching lines @@
       'dimensions': {
         u'OS': u'Windows-3.1.1',
         u'hostname': u'localhost',
         u'pool': u'default',
       },
       'env': {u'foo': u'bar', u'joe': u'2'},
       'extra_args': [],
       'execution_timeout_secs': 30,
       'grace_period_secs': 30,
       'idempotent': True,
-      'inputs_ref': None,
+      'inputs_ref': {
+        'isolated': None,
+        'isolatedserver': 'https://isolateserver.appspot.com',
+        'namespace': 'default-gzip',
+      },
       'io_timeout_secs': None,
       'packages': [{'package_name': 'rm', 'version': PINNED_PACKAGE_VERSION}],
     }
     expected_request = {
       'authenticated': auth_testing.DEFAULT_MOCKED_IDENTITY,
       'name': u'Request name',
       'parent_task_id': unicode(parent_id),
       'priority': 49,
       'properties': expected_properties,
       # Intentionally hard code the hash value since it has to be deterministic.
       # Other unit tests should use the calculated value.
-      'properties_hash': '83b350298f05eff6072d54d2c6f031d06cc30449',
+      'properties_hash': 'c3e067b4e232be5478e7147bb1f0506477444014',
       'pubsub_topic': None,
       'pubsub_userdata': None,
       'tags': [
         u'OS:Windows-3.1.1',
         u'hostname:localhost',
         u'pool:default',
         u'priority:49',
         u'tag:1',
         u'user:Jesus',
       ],
@@ skipping 19 matching lines @@
       _gen_request(parent_task_id='1d69b9f088008810')
 
   def test_make_request_idempotent(self):
     request = mkreq(_gen_request(properties=dict(idempotent=True)))
     as_dict = request.to_dict()
     self.assertEqual(True, as_dict['properties']['idempotent'])
     # Intentionally hard code the hash value since it has to be deterministic.
     # Other unit tests should use the calculated value.
     # Ensure the algorithm is deterministic.
     self.assertEqual(
-        '83b350298f05eff6072d54d2c6f031d06cc30449', as_dict['properties_hash'])
+        'c3e067b4e232be5478e7147bb1f0506477444014', as_dict['properties_hash'])
 
   def test_duped(self):
     # Two TestRequest with the same properties.
     request_1 = mkreq(_gen_request(properties=dict(idempotent=True)))
     now = utils.utcnow()
     request_2 = mkreq(_gen_request(
         name='Other',
         user='Other',
         priority=201,
         created_ts=now,
@@ skipping 94 matching lines @@
         created_ts=now,
         expiration_ts=
             now+datetime.timedelta(seconds=task_request._MIN_TIMEOUT_SECS)))
     mkreq(_gen_request(
         created_ts=now,
         expiration_ts=
             now + datetime.timedelta(seconds=task_request._SEVEN_DAYS_SECS)))
 
     # Try with isolated/isolatedserver/namespace.
     with self.assertRaises(datastore_errors.BadValueError):
+      # Both command and inputs_ref.isolated.
       mkreq(_gen_request(properties=dict(
           command=['see', 'spot', 'run'],
-          inputs_ref=task_request.FilesRef())))
+          inputs_ref=task_request.FilesRef(
+              isolated='deadbeef',
+              isolatedserver='http://localhost:1',
+              namespace='default-gzip'))))
+    with self.assertRaises(datastore_errors.BadValueError):
+      # inputs_ref without server/namespace.
+      mkreq(_gen_request(properties=dict(inputs_ref=task_request.FilesRef())))
+    mkreq(_gen_request(properties=dict(
+        command=[],
+        inputs_ref=task_request.FilesRef(
+            isolated='deadbeefdeadbeefdeadbeefdeadbeefdeadbeef',
+            isolatedserver='http://localhost:1',
+            namespace='default-gzip'))))
 
   def test_make_request_clone(self):
     # Compare with test_make_request().
     parent = mkreq(_gen_request())
     # Hack: Would need to know about TaskResultSummary.
     parent_id = task_pack.pack_request_key(parent.key) + '1'
     data = _gen_request(
         properties=dict(idempotent=True), parent_task_id=parent_id)
     request = task_request.make_request_clone(mkreq(data))
     # Differences from make_request() are:
     # - idempotent was reset to False.
     # - parent_task_id was reset to None.
     expected_properties = {
       'command': [u'command1', u'arg1'],
       'dimensions': {
         u'OS': u'Windows-3.1.1',
         u'hostname': u'localhost',
         u'pool': u'default',
       },
       'env': {u'foo': u'bar', u'joe': u'2'},
       'execution_timeout_secs': 30,
       'extra_args': [],
       'grace_period_secs': 30,
       'idempotent': False,
-      'inputs_ref': None,
+      'inputs_ref': {
+        'isolated': None,
+        'isolatedserver': 'https://isolateserver.appspot.com',
+        'namespace': 'default-gzip',
+      },
       'io_timeout_secs': None,
       'packages': [{'package_name': 'rm', 'version': PINNED_PACKAGE_VERSION}],
     }
     # Differences from make_request() are:
     # - parent_task_id was reset to None.
     # - tag 'user:' was replaced
     # - user was replaced.
     expected_request = {
       'authenticated': auth_testing.DEFAULT_MOCKED_IDENTITY,
       'name': u'Request name (Retry #1)',
@@ skipping 56 matching lines @@
         ndb.Key(task_request.TaskRequest, 0x7f14acec2fcfffff),
         task_request.request_id_to_key(0xeb5313d0300000))
 
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     unittest.TestCase.maxDiff = None
   logging.basicConfig(
       level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
   unittest.main()