swarming: isolate defaults

appengine/swarming/handlers_endpoints_test.py

Index: appengine/swarming/handlers_endpoints_test.py
diff --git a/appengine/swarming/handlers_endpoints_test.py b/appengine/swarming/handlers_endpoints_test.py
index ec1ebc110f0ca2c6234508cfe4f5af8cbeb11120..9e0fc4bb1e49d3029c20146886b98bed11c43f21 100755
--- a/appengine/swarming/handlers_endpoints_test.py
+++ b/appengine/swarming/handlers_endpoints_test.py
@@ -136,6 +136,10 @@ class ServerApiTest(BaseTest):
 class TasksApiTest(BaseTest):
   api_service_cls = handlers_endpoints.SwarmingTasksService
 
+  def setUp(self):
+    super(TasksApiTest, self).setUp()
+    utils.clear_cache(config.settings)
+
   def test_new_ok_raw(self):
     """Asserts that new generates appropriate metadata."""
     self.mock(random, 'getrandbits', lambda _: 0x88)
@@ -505,6 +509,72 @@ class TasksApiTest(BaseTest):
     response = self.call_api('new', body=message_to_dict(request))
     self.assertEqual(expected, response.json)
 
+  def test_new_ok_isolated_with_defaults(self):
+    self.mock(random, 'getrandbits', lambda _: 0x88)
+    now = datetime.datetime(2010, 1, 2, 3, 4, 5)
+    self.mock_now(now)
+    str_now = unicode(now.strftime(self.DATETIME_NO_MICRO))
+
+    cfg = config.settings()
+    cfg.isolate.default_server_host = 'isolateserver.appspot.com'
+    cfg.isolate.default_namespace = 'default-gzip'
+    self.mock(config, 'settings', lambda: cfg)
+
+    request = swarming_rpcs.NewTaskRequest(
+        expiration_secs=30,
+        name='job1',
+        priority=200,
+        properties=swarming_rpcs.TaskProperties(
+            dimensions=[
+              swarming_rpcs.StringPair(key='pool', value='default'),
+              swarming_rpcs.StringPair(key='foo', value='bar'),
+            ],
+            env=[
+              swarming_rpcs.StringPair(key='PATH', value='/'),
+            ],
+            execution_timeout_secs=30,
+            inputs_ref=swarming_rpcs.FilesRef(isolated='1'*40),
+            io_timeout_secs=30),
+        tags=['foo:bar'],
+        user='joe@localhost')
+    expected = {
+      u'request': {
+        u'authenticated': u'user:user@example.com',
+        u'created_ts': str_now,
+        u'expiration_secs': u'30',
+        u'name': u'job1',
+        u'priority': u'200',
+        u'properties': {
+          u'dimensions': [
+            {u'key': u'foo', u'value': u'bar'},
+            {u'key': u'pool', u'value': u'default'},
+          ],
+          u'env': [
+            {u'key': u'PATH', u'value': u'/'},
+          ],
+          u'execution_timeout_secs': u'30',
+          u'grace_period_secs': u'30',
+          u'idempotent': False,
+          u'inputs_ref': {
+            'isolated': '1'*40,
+            'isolatedserver': 'https://isolateserver.appspot.com',
+            'namespace': 'default-gzip',
+          },
+          u'io_timeout_secs': u'30',
+        },
+        u'tags': [
+          u'foo:bar',
+          u'pool:default',
+          u'priority:200',
+          u'user:joe@localhost',
+        ],
+        u'user': u'joe@localhost',
+      },
+      u'task_id': u'5cee488008810',
+    }
+    response = self.call_api('new', body=message_to_dict(request))
+    self.assertEqual(expected, response.json)
+
   def test_new_ok_isolated_output(self):
     """Asserts that new generates appropriate metadata."""
     self.mock(random, 'getrandbits', lambda _: 0x88)
@@ -516,6 +586,75 @@ class TasksApiTest(BaseTest):
         name='job1',
         priority=200,
         properties=swarming_rpcs.TaskProperties(
+            command=['rm', '-rf', '/'],
+            dimensions=[
+              swarming_rpcs.StringPair(key='pool', value='default'),
+              swarming_rpcs.StringPair(key='foo', value='bar'),
+            ],
+            env=[
+              swarming_rpcs.StringPair(key='PATH', value='/'),
+            ],
+            execution_timeout_secs=30,
+            io_timeout_secs=30,
+            outputs_target=swarming_rpcs.IsolatedOutputsTarget(
+                isolatedserver='http://localhost:1',
+                namespace='default-gzip')),
+        tags=['foo:bar'],
+        user='joe@localhost')
+    expected = {
+      u'request': {
+        u'authenticated': u'user:user@example.com',
+        u'created_ts': str_now,
+        u'expiration_secs': u'30',
+        u'name': u'job1',
+        u'priority': u'200',
+        u'properties': {
+          u'command': [u'rm', u'-rf', u'/'],
+          u'dimensions': [
+            {u'key': u'foo', u'value': u'bar'},
+            {u'key': u'pool', u'value': u'default'},
+          ],
+          u'env': [
+            {u'key': u'PATH', u'value': u'/'},
+          ],
+          u'execution_timeout_secs': u'30',
+          u'grace_period_secs': u'30',
+          u'idempotent': False,
+          u'io_timeout_secs': u'30',
+          u'outputs_target': {
+            'isolatedserver': 'http://localhost:1',
+            'namespace': 'default-gzip',
+          },
+        },
+        u'tags': [
+          u'foo:bar',
+          u'pool:default',
+          u'priority:200',
+          u'user:joe@localhost',
+        ],
+        u'user': u'joe@localhost',
+      },
+      u'task_id': u'5cee488008810',
+    }
+    response = self.call_api('new', body=message_to_dict(request))
+    self.assertEqual(expected, response.json)
+
+  def test_new_ok_isolated_output_with_defaults(self):
+    self.mock(random, 'getrandbits', lambda _: 0x88)
+    now = datetime.datetime(2010, 1, 2, 3, 4, 5)
+    self.mock_now(now)
+    str_now = unicode(now.strftime(self.DATETIME_NO_MICRO))
+
+    cfg = config.settings()
+    cfg.isolate.default_server_host = 'isolateserver.appspot.com'
+    cfg.isolate.default_namespace = 'default-gzip'
+    self.mock(config, 'settings', lambda: cfg)
+
+    request = swarming_rpcs.NewTaskRequest(
+        expiration_secs=30,
+        name='job1',
+        priority=200,
+        properties=swarming_rpcs.TaskProperties(
           command=['rm', '-rf', '/'],
           dimensions=[
             swarming_rpcs.StringPair(key='pool', value='default'),
@@ -525,10 +664,7 @@ class TasksApiTest(BaseTest):
             swarming_rpcs.StringPair(key='PATH', value='/'),
           ],
           execution_timeout_secs=30,
-          io_timeout_secs=30,
-          outputs_target=swarming_rpcs.IsolatedOutputsTarget(
-              isolatedserver='http://localhost:1',
-              namespace='default-gzip')),
+          io_timeout_secs=30),
         tags=['foo:bar'],
         user='joe@localhost')
     expected = {
@@ -552,7 +688,7 @@ class TasksApiTest(BaseTest):
           u'idempotent': False,
           u'io_timeout_secs': u'30',
           u'outputs_target': {
-            'isolatedserver': 'http://localhost:1',
+            'isolatedserver': 'https://isolateserver.appspot.com',
             'namespace': 'default-gzip',
           },
         },