| Index: appengine/swarming/server/task_scheduler_test.py
|
| diff --git a/appengine/swarming/server/task_scheduler_test.py b/appengine/swarming/server/task_scheduler_test.py
|
| index 675cf75c6b7de1793eea63c2899c16f70f3bd1c4..f11db2d6b6ba9d434cc65fa9cf779df956f43139 100755
|
| --- a/appengine/swarming/server/task_scheduler_test.py
|
| +++ b/appengine/swarming/server/task_scheduler_test.py
|
| @@ -272,6 +272,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| task_scheduler.bot_update_task(
|
| run_result_key=run_result.key,
|
| bot_id='localhost',
|
| + cipd_pins=None,
|
| output='Foo1',
|
| output_chunk_start=0,
|
| exit_code=0,
|
| @@ -310,6 +311,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| 'bot_dimensions': bot_dimensions,
|
| 'bot_id': u'localhost',
|
| 'bot_version': u'abc',
|
| + 'cipd_pins': None,
|
| 'children_task_ids': [],
|
| 'completed_ts': now or self.now,
|
| 'costs_usd': [],
|
| @@ -470,6 +472,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| task_scheduler.bot_update_task(
|
| run_result_key=run_result.key,
|
| bot_id='localhost',
|
| + cipd_pins=None,
|
| output='Foo1',
|
| output_chunk_start=0,
|
| exit_code=0,
|
| @@ -518,6 +521,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| 'bot_dimensions': None,
|
| 'bot_id': None,
|
| 'bot_version': None,
|
| + 'cipd_pins': None,
|
| 'children_task_ids': [],
|
| 'completed_ts': None,
|
| 'costs_usd': [],
|
| @@ -563,6 +567,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| 'bot_dimensions': bot_dimensions,
|
| 'bot_id': u'localhost',
|
| 'bot_version': u'abc',
|
| + 'cipd_pins': None,
|
| 'children_task_ids': [],
|
| 'completed_ts': None,
|
| 'costs_usd': [0.],
|
| @@ -598,6 +603,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| 'bot_dimensions': bot_dimensions,
|
| 'bot_id': u'localhost',
|
| 'bot_version': u'abc',
|
| + 'cipd_pins': None,
|
| 'children_task_ids': [],
|
| 'completed_ts': None,
|
| 'cost_usd': 0.,
|
| @@ -638,6 +644,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| task_scheduler.bot_update_task(
|
| run_result_key=run_result.key,
|
| bot_id='localhost',
|
| + cipd_pins=None,
|
| output='Foo1',
|
| output_chunk_start=0,
|
| exit_code=0,
|
| @@ -654,6 +661,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| task_scheduler.bot_update_task(
|
| run_result_key=run_result.key,
|
| bot_id='localhost',
|
| + cipd_pins=None,
|
| output='Foo1',
|
| output_chunk_start=0,
|
| exit_code=0,
|
| @@ -669,6 +677,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| 'bot_dimensions': bot_dimensions,
|
| 'bot_id': u'localhost',
|
| 'bot_version': u'abc',
|
| + 'cipd_pins': None,
|
| 'children_task_ids': [],
|
| 'completed_ts': done_ts,
|
| 'costs_usd': [0.1],
|
| @@ -708,6 +717,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| 'bot_dimensions': bot_dimensions,
|
| 'bot_id': u'localhost',
|
| 'bot_version': u'abc',
|
| + 'cipd_pins': None,
|
| 'children_task_ids': [],
|
| 'completed_ts': done_ts,
|
| 'cost_usd': 0.1,
|
| @@ -747,6 +757,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| task_scheduler.bot_update_task(
|
| run_result_key=run_result.key,
|
| bot_id='localhost',
|
| + cipd_pins=None,
|
| output='Foo1',
|
| output_chunk_start=0,
|
| exit_code=1,
|
| @@ -763,6 +774,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| 'bot_dimensions': bot_dimensions,
|
| 'bot_id': u'localhost',
|
| 'bot_version': u'abc',
|
| + 'cipd_pins': None,
|
| 'children_task_ids': [],
|
| 'completed_ts': self.now,
|
| 'costs_usd': [0.1],
|
| @@ -799,6 +811,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| 'bot_dimensions': bot_dimensions,
|
| 'bot_id': u'localhost',
|
| 'bot_version': u'abc',
|
| + 'cipd_pins': None,
|
| 'children_task_ids': [],
|
| 'completed_ts': self.now,
|
| 'cost_usd': 0.1,
|
| @@ -871,6 +884,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| task_scheduler.bot_update_task(
|
| run_result_key=run_result.key,
|
| bot_id='localhost',
|
| + cipd_pins=None,
|
| output='hi',
|
| output_chunk_start=0,
|
| exit_code=None,
|
| @@ -885,6 +899,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| task_scheduler.bot_update_task(
|
| run_result_key=run_result.key,
|
| bot_id='localhost',
|
| + cipd_pins=None,
|
| output='hey',
|
| output_chunk_start=2,
|
| exit_code=0,
|
| @@ -903,6 +918,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| task_scheduler.bot_update_task(
|
| run_result_key=run_result.key,
|
| bot_id='localhost',
|
| + cipd_pins=None,
|
| output='hi',
|
| output_chunk_start=0,
|
| exit_code=None,
|
| @@ -917,6 +933,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| task_scheduler.bot_update_task(
|
| run_result_key=run_result.key,
|
| bot_id='localhost',
|
| + cipd_pins=None,
|
| output='hey',
|
| output_chunk_start=1,
|
| exit_code=None,
|
| @@ -939,6 +956,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| task_scheduler.bot_update_task(
|
| run_result_key=run_result.key,
|
| bot_id='localhost',
|
| + cipd_pins=None,
|
| output='hi',
|
| output_chunk_start=0,
|
| exit_code=0,
|
| @@ -974,6 +992,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| task_scheduler.bot_update_task(
|
| run_result_key=run_result.key,
|
| bot_id='localhost',
|
| + cipd_pins=None,
|
| output='Foo1',
|
| output_chunk_start=0,
|
| exit_code=0,
|
| @@ -991,6 +1010,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| task_scheduler.bot_update_task(
|
| run_result_key=run_result.key,
|
| bot_id='localhost',
|
| + cipd_pins=None,
|
| output='Foo1',
|
| output_chunk_start=0,
|
| exit_code=0,
|
| @@ -1018,6 +1038,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| task_scheduler.bot_update_task(
|
| run_result_key=run_result.key,
|
| bot_id='localhost',
|
| + cipd_pins=None,
|
| output='hi',
|
| output_chunk_start=0,
|
| exit_code=0,
|
| @@ -1032,6 +1053,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| 'bot_dimensions': bot_dimensions,
|
| 'bot_id': u'localhost',
|
| 'bot_version': u'abc',
|
| + 'cipd_pins': None,
|
| 'children_task_ids': [],
|
| 'completed_ts': self.now,
|
| 'costs_usd': [0.1],
|
| @@ -1067,6 +1089,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| 'bot_dimensions': bot_dimensions,
|
| 'bot_id': u'localhost',
|
| 'bot_version': u'abc',
|
| + 'cipd_pins': None,
|
| 'children_task_ids': [],
|
| 'completed_ts': self.now,
|
| 'cost_usd': 0.1,
|
| @@ -1109,6 +1132,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| 'bot_dimensions': dimensions,
|
| 'bot_id': u'localhost',
|
| 'bot_version': u'abc',
|
| + 'cipd_pins': None,
|
| 'children_task_ids': [],
|
| 'completed_ts': None,
|
| 'costs_usd': [0.],
|
| @@ -1143,6 +1167,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| 'bot_dimensions': dimensions,
|
| 'bot_id': u'localhost',
|
| 'bot_version': u'abc',
|
| + 'cipd_pins': None,
|
| 'children_task_ids': [],
|
| 'completed_ts': None,
|
| 'cost_usd': 0.,
|
| @@ -1231,6 +1256,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| 'bot_dimensions': None,
|
| 'bot_id': None,
|
| 'bot_version': None,
|
| + 'cipd_pins': None,
|
| 'children_task_ids': [],
|
| 'completed_ts': None,
|
| 'costs_usd': [],
|
| @@ -1304,6 +1330,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| 'bot_dimensions': bot_dimensions,
|
| 'bot_id': u'localhost',
|
| 'bot_version': u'abc',
|
| + 'cipd_pins': None,
|
| 'children_task_ids': [],
|
| 'completed_ts': None,
|
| 'costs_usd': [0.],
|
| @@ -1371,6 +1398,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| 'bot_dimensions': bot_dimensions,
|
| 'bot_id': u'localhost',
|
| 'bot_version': u'abc',
|
| + 'cipd_pins': None,
|
| 'children_task_ids': [],
|
| 'completed_ts': None,
|
| 'cost_usd': 0.,
|
| @@ -1392,6 +1420,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| 'bot_dimensions': bot_dimensions,
|
| 'bot_id': u'localhost',
|
| 'bot_version': u'abc',
|
| + 'cipd_pins': None,
|
| 'children_task_ids': [],
|
| 'completed_ts': None,
|
| 'costs_usd': [0.],
|
| @@ -1436,6 +1465,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| task_scheduler.bot_update_task(
|
| run_result_key=run_result.key,
|
| bot_id='localhost-second',
|
| + cipd_pins=None,
|
| output='Foo1',
|
| output_chunk_start=0,
|
| exit_code=0,
|
| @@ -1450,6 +1480,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| 'bot_dimensions': bot_dimensions,
|
| 'bot_id': u'localhost-second',
|
| 'bot_version': u'abc',
|
| + 'cipd_pins': None,
|
| 'children_task_ids': [],
|
| 'completed_ts': now_2,
|
| 'costs_usd': [0., 0.1],
|
| @@ -1515,6 +1546,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| 'bot_dimensions': bot_dimensions,
|
| 'bot_id': u'localhost',
|
| 'bot_version': u'abc',
|
| + 'cipd_pins': None,
|
| 'children_task_ids': [],
|
| 'completed_ts': None,
|
| 'cost_usd': 0.,
|
| @@ -1536,6 +1568,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| 'bot_dimensions': bot_dimensions,
|
| 'bot_id': u'localhost',
|
| 'bot_version': u'abc',
|
| + 'cipd_pins': None,
|
| 'children_task_ids': [],
|
| 'completed_ts': None,
|
| 'costs_usd': [0.],
|
| @@ -1612,6 +1645,7 @@ class TaskSchedulerApiTest(test_case.TestCase):
|
| 'bot_dimensions': bot_dimensions,
|
| 'bot_id': u'localhost-second',
|
| 'bot_version': u'abc',
|
| + 'cipd_pins': None,
|
| 'children_task_ids': [],
|
| 'completed_ts': None,
|
| 'costs_usd': [0., 0.],
|
|
|