[Findit] Adding additional fields to try job metadata

appengine/findit/waterfall/test/monitor_try_job_pipeline_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.
 
 from datetime import datetime
 import json
 import time
 
 from common.waterfall import buildbucket_client
 from model import analysis_status
@@ skipping 120 matching lines @@
     self.assertIsNone(MonitorTryJobPipeline._MicrosecondsToDatetime(None))
 
   def testUpdateTryJobMetadataForBuildError(self):
     error_data = {
         'reason': 'BUILD_NOT_FOUND',
         'message': 'message'
     }
     error = buildbucket_client.BuildbucketError(error_data)
     try_job_data = WfTryJobData.Create('1')
 
-    MonitorTryJobPipeline._UpdateTryJobMetadataForBuildError(
-        try_job_data, error)
+    MonitorTryJobPipeline._UpdateTryJobMetadata(
+        try_job_data, None, None, error, False)
     self.assertEqual(try_job_data.error, error_data)
 
   def testUpdateTryJobMetadataForCompletedBuild(self):
     try_job_id = '1'
     url = 'url'
     build_data = {
         'id': try_job_id,
         'url': url,
         'status': 'COMPLETED',
         'completed_ts': '1454367574000000',
         'created_ts': '1454367570000000',
         'result_details_json': json.dumps({
             'properties': {
                 'report': {
                     'result': {
                         'rev1': 'passed',
                         'rev2': 'failed'
                     },
                     'metadata': {
                         'regression_range_size': 2
                     }
                 }
             }
         })
     }
     build = buildbucket_client.BuildbucketBuild(build_data)
     try_job_data = WfTryJobData.Create(try_job_id)
 
-    MonitorTryJobPipeline._UpdateTryJobMetadataForCompletedBuild(
-        try_job_data, build, None, timed_out=False)
+    MonitorTryJobPipeline._UpdateTryJobMetadata(
+        try_job_data, None, build, None, False)
     try_job_data = WfTryJobData.Get(try_job_id)
     self.assertIsNone(try_job_data.error)
     self.assertEqual(try_job_data.regression_range_size, 2)
     self.assertEqual(try_job_data.number_of_commits_analyzed, 2)
     self.assertEqual(try_job_data.end_time, datetime(2016, 2, 1, 22, 59, 34))
     self.assertEqual(try_job_data.request_time,
                      datetime(2016, 2, 1, 22, 59, 30))
     self.assertEqual(try_job_data.try_job_url, url)
 
-    MonitorTryJobPipeline._UpdateTryJobMetadataForCompletedBuild(
-        try_job_data, build, None, timed_out=True)
+    MonitorTryJobPipeline._UpdateTryJobMetadata(
+        try_job_data, None, build, None, True)
     self.assertEqual(try_job_data.error,
-                     {'message': MonitorTryJobPipeline.TIMEOUT,
+                     {'message': 'Try job monitoring was abandoned.',
                       'reason': MonitorTryJobPipeline.TIMEOUT})
 
   def testGetTryJobsForCompileSuccess(self):
     master_name = 'm'
     builder_name = 'b'
     build_number = 1
     try_job_id = '1'
     regression_range_size = 2
 
     try_job = WfTryJob.Create(master_name, builder_name, build_number)
@@ skipping 95 matching lines @@
     try_job_id = '3'
 
     try_job = WfTryJob.Create(master_name, builder_name, build_number).put()
 
     pipeline = MonitorTryJobPipeline()
     pipeline._UpdateTryJobResult(
         buildbucket_client.BuildbucketBuild.STARTED, master_name, builder_name,
         build_number, TryJobType.TEST, try_job_id, 'url')
     try_job = WfTryJob.Get(master_name, builder_name, build_number)
     self.assertEqual(analysis_status.RUNNING, try_job.status)