| 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 3bb639302ad0aab164803c6a2a29f402aad1b7ce..2cd5ff6c7723eb0289d322dfe6a8073ece75ad7e 100755
|
| --- a/appengine/swarming/server/task_scheduler_test.py
|
| +++ b/appengine/swarming/server/task_scheduler_test.py
|
| @@ -269,6 +269,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,
|
| @@ -307,6 +308,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': [],
|
| @@ -467,6 +469,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,
|
| @@ -515,6 +518,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': [],
|
| @@ -560,6 +564,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.],
|
| @@ -595,6 +600,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.,
|
| @@ -635,6 +641,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,
|
| @@ -651,6 +658,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,
|
| @@ -666,6 +674,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],
|
| @@ -705,6 +714,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,
|
| @@ -744,6 +754,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,
|
| @@ -760,6 +771,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],
|
| @@ -796,6 +808,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,
|
| @@ -830,6 +843,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,
|
| @@ -844,6 +858,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,
|
| @@ -862,6 +877,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,
|
| @@ -876,6 +892,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,
|
| @@ -898,6 +915,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,
|
| @@ -933,6 +951,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,
|
| @@ -950,6 +969,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,
|
| @@ -977,6 +997,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,
|
| @@ -991,6 +1012,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],
|
| @@ -1026,6 +1048,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,
|
| @@ -1068,6 +1091,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.],
|
| @@ -1102,6 +1126,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.,
|
| @@ -1190,6 +1215,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': [],
|
| @@ -1263,6 +1289,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.],
|
| @@ -1330,6 +1357,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.,
|
| @@ -1351,6 +1379,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.],
|
| @@ -1395,6 +1424,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,
|
| @@ -1409,6 +1439,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],
|
| @@ -1474,6 +1505,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.,
|
| @@ -1495,6 +1527,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.],
|
| @@ -1571,6 +1604,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.],
|
|
|