Chromium Code Reviews| Index: appengine/findit/waterfall/test/schedule_try_job_pipeline_test.py |
| diff --git a/appengine/findit/waterfall/test/schedule_try_job_pipeline_test.py b/appengine/findit/waterfall/test/schedule_try_job_pipeline_test.py |
| index e7b8dc3641e7e6bd60ba1dfa31904d312c5c81d0..8dccf3962c5a5c80c336252e513e43ba194b249e 100644 |
| --- a/appengine/findit/waterfall/test/schedule_try_job_pipeline_test.py |
| +++ b/appengine/findit/waterfall/test/schedule_try_job_pipeline_test.py |
| @@ -4,6 +4,7 @@ |
| from common.waterfall import buildbucket_client |
| from model.wf_try_job import WfTryJob |
| +from model.wf_try_job_data import WfTryJobData |
| from waterfall.schedule_try_job_pipeline import ScheduleTryJobPipeline |
| from waterfall.test import wf_testcase |
| from waterfall.try_job_type import TryJobType |
| @@ -78,12 +79,14 @@ class ScheduleTryjobPipelineTest(wf_testcase.WaterfallTestCase): |
| build_number = 223 |
| good_revision = 'rev1' |
| bad_revision = 'rev2' |
| + build_id = '1' |
| + url = 'url' |
| responses = [ |
| { |
| 'build': { |
| - 'id': '1', |
| - 'url': 'url', |
| + 'id': build_id, |
| + 'url': url, |
| 'status': 'SCHEDULED', |
| } |
| } |
| @@ -99,11 +102,21 @@ class ScheduleTryjobPipelineTest(wf_testcase.WaterfallTestCase): |
| TryJobType.COMPILE, None, None, ['r5']) |
| try_job = WfTryJob.Get(master_name, builder_name, build_number) |
| + try_job_data = WfTryJobData.Get(build_id) |
| + try_job_data.put() |
|
chanli
2016/04/26 23:52:13
This line can be deleted, right?
lijeffrey
2016/04/27 00:59:58
Oops good catch!
|
| + |
| expected_try_job_id = '1' |
| self.assertEqual(expected_try_job_id, try_job_id) |
| self.assertEqual( |
| expected_try_job_id, try_job.compile_results[-1]['try_job_id']) |
| self.assertTrue(expected_try_job_id in try_job.try_job_ids) |
| + self.assertIsNotNone(try_job_data) |
| + self.assertEqual(try_job_data.master_name, master_name) |
| + self.assertEqual(try_job_data.builder_name, builder_name) |
| + self.assertEqual(try_job_data.build_number, build_number) |
| + self.assertEqual(try_job_data.try_job_type, TryJobType.COMPILE) |
| + self.assertFalse(try_job_data.has_compile_targets) |
| + self.assertTrue(try_job_data.has_heuristic_results) |
| def testSuccessfullyScheduleNewTryJobForTest(self): |
| master_name = 'm' |
| @@ -112,11 +125,12 @@ class ScheduleTryjobPipelineTest(wf_testcase.WaterfallTestCase): |
| good_revision = 'rev1' |
| bad_revision = 'rev2' |
| targeted_tests = {'a': ['test1', 'test2']} |
| + build_id = '1' |
| responses = [ |
| { |
| 'build': { |
| - 'id': '1', |
| + 'id': build_id, |
| 'url': 'url', |
| 'status': 'SCHEDULED', |
| } |
| @@ -132,5 +146,13 @@ class ScheduleTryjobPipelineTest(wf_testcase.WaterfallTestCase): |
| TryJobType.TEST, None, targeted_tests, None) |
| try_job = WfTryJob.Get(master_name, builder_name, build_number) |
| - self.assertEqual('1', try_job_id) |
| - self.assertEqual('1', try_job.test_results[-1]['try_job_id']) |
| + try_job_data = WfTryJobData.Get(try_job_id) |
| + self.assertEqual(try_job_id, build_id) |
| + self.assertEqual(try_job.test_results[-1]['try_job_id'], build_id) |
| + self.assertIsNotNone(try_job_data) |
| + self.assertEqual(try_job_data.master_name, master_name) |
| + self.assertEqual(try_job_data.builder_name, builder_name) |
| + self.assertEqual(try_job_data.build_number, build_number) |
| + self.assertEqual(try_job_data.try_job_type, TryJobType.TEST) |
| + self.assertFalse(try_job_data.has_compile_targets) |
| + self.assertFalse(try_job_data.has_heuristic_results) |