[Findit] Send targeted_tests to try-job in build_parameter instend of build_property (Findit side).

appengine/findit/common/waterfall/test/buildbucket_client_test.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import json
 
 from testing_utils import testing
 
 from common.waterfall import buildbucket_client
 
 
 class BuildBucketClientTest(testing.AppengineTestCase):
 
   def setUp(self):
     super(BuildBucketClientTest, self).setUp()
 
     with self.mock_urlfetch() as urlfetch:
       self.mocked_urlfetch = urlfetch
 
   def testGetBucketName(self):
     mapping = {
         'a': 'master.a',
         'master.b': 'master.b',
     }
     for master_name, expected_full_master_name in mapping.iteritems():
       self.assertEqual(expected_full_master_name,
                        buildbucket_client._GetBucketName(master_name))
 
-  def testTryJobToBuildbucketRequestWithRevision(self):
-    try_job = buildbucket_client.TryJob('m', 'b', 'r', {'a': '1'}, ['a'])
+  def testTryJobToBuildbucketRequestWithTests(self):
+    try_job = buildbucket_client.TryJob(
+        'm', 'b', 'r', {'a': '1'}, ['a'],
+        {'tests': {'a_tests': ['Test.One', 'Test.Two']}})
     expceted_parameters = {
         'builder_name': 'b',
         'changes': [
+            {
+                'author': {
+                    'email': buildbucket_client._ROLE_EMAIL,
+                },
+                'revision': 'r',
+            },
+        ],
+        'properties': {
+            'a': '1',
+        },
+        'additional_build_parameters': {
+            'tests': {
+                'a_tests': ['Test.One', 'Test.Two']
+            }
+        }
+    }
+
+    request_json = try_job.ToBuildbucketRequest()
+    self.assertEqual('master.m', request_json['bucket'])
+    self.assertEqual(2, len(request_json['tags']))
+    self.assertEqual('a', request_json['tags'][0])
+    self.assertEqual('user_agent:findit', request_json['tags'][1])
+    parameters = json.loads(request_json['parameters_json'])
+    self.assertEqual(expceted_parameters, parameters)
+
+  def testTryJobToBuildbucketRequestWithRevision(self):
+    try_job = buildbucket_client.TryJob('m', 'b', 'r', {'a': '1'}, ['a'], {})
+    expceted_parameters = {
+        'builder_name': 'b',
+        'changes': [
             {
                 'author': {
                     'email': buildbucket_client._ROLE_EMAIL,
                 },
                 'revision': 'r',
             },
         ],
         'properties': {
             'a': '1',
         },
     }
 
     request_json = try_job.ToBuildbucketRequest()
     self.assertEqual('master.m', request_json['bucket'])
     self.assertEqual(2, len(request_json['tags']))
     self.assertEqual('a', request_json['tags'][0])
     self.assertEqual('user_agent:findit', request_json['tags'][1])
     parameters = json.loads(request_json['parameters_json'])
     self.assertEqual(expceted_parameters, parameters)
 
   def testTryJobToBuildbucketRequestWithoutRevision(self):
-    try_job = buildbucket_client.TryJob('m', 'b', None, {'a': '1'}, ['a'])
+    try_job = buildbucket_client.TryJob('m', 'b', None, {'a': '1'}, ['a'], {})
     expceted_parameters = {
         'builder_name': 'b',
         'properties': {
             'a': '1',
         },
     }
 
     request_json = try_job.ToBuildbucketRequest()
     self.assertEqual('master.m', request_json['bucket'])
     self.assertEqual(2, len(request_json['tags']))
@@ skipping 18 matching lines @@
           headers=headers, data=try_job_request)
 
   def testTriggerTryJobsSuccess(self):
     response = {
         'build': {
             'id': '1',
             'url': 'url',
             'status': 'SCHEDULED',
         }
     }
-    try_job = buildbucket_client.TryJob('m', 'b', 'r', {'a': 'b'}, [])
+    try_job = buildbucket_client.TryJob('m', 'b', 'r', {'a': 'b'}, [], {})
     self._MockUrlFetch(
         None, json.dumps(try_job.ToBuildbucketRequest()), json.dumps(response))
     results = buildbucket_client.TriggerTryJobs([try_job])
     self.assertEqual(1, len(results))
     error, build = results[0]
     self.assertIsNone(error)
     self.assertIsNotNone(build)
     self.assertEqual('1', build.id)
     self.assertEqual('url', build.url)
     self.assertEqual('SCHEDULED', build.status)
 
   def testTriggerTryJobsFailure(self):
     response = {
         'error': {
             'reason': 'error',
             'message': 'message',
         }
     }
-    try_job = buildbucket_client.TryJob('m', 'b', 'r', {}, [])
+    try_job = buildbucket_client.TryJob('m', 'b', 'r', {}, [], {})
     self._MockUrlFetch(
         None, json.dumps(try_job.ToBuildbucketRequest()), json.dumps(response))
     results = buildbucket_client.TriggerTryJobs([try_job])
     self.assertEqual(1, len(results))
     error, build = results[0]
     self.assertIsNotNone(error)
     self.assertEqual('error', error.reason)
     self.assertEqual('message', error.message)
     self.assertIsNone(build)
 
   def testTriggerTryJobsRequestFailure(self):
     response = 'Not Found'
-    try_job = buildbucket_client.TryJob('m', 'b', 'r', {}, [])
+    try_job = buildbucket_client.TryJob('m', 'b', 'r', {}, [], {})
     self._MockUrlFetch(
         None, json.dumps(try_job.ToBuildbucketRequest()),
         response, 404)
     results = buildbucket_client.TriggerTryJobs([try_job])
     self.assertEqual(1, len(results))
     error, build = results[0]
     self.assertIsNotNone(error)
     self.assertEqual(404, error.reason)
     self.assertEqual('Not Found', error.message)
     self.assertIsNone(build)
@@ skipping 57 matching lines @@
     response = 'Not Found'
     self._MockUrlFetch(
         '3', None, response, 404)
     results = buildbucket_client.GetTryJobs(['3'])
     self.assertEqual(1, len(results))
     error, build = results[0]
     self.assertIsNotNone(error)
     self.assertEqual(404, error.reason)
     self.assertEqual('Not Found', error.message)
     self.assertIsNone(build)