Make deleted bots still show up when searched for by id

appengine/swarming/handlers_endpoints_test.py

 #!/usr/bin/env python
 # coding=utf-8
 # Copyright 2015 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 import base64
 import datetime
 import json
 import logging
@@ skipping 1571 matching lines @@
         dimensions={'foo': ['bar'], 'id': ['id1']}, state={'ram': 65},
         version='123456789', quarantined=False, task_id=None, task_name=None)
     bot_management.bot_event(
         event_type='bot_connected', bot_id='id2',
         external_ip='8.8.4.4', authenticated_as='bot:whitelisted-ip',
         dimensions={'foo': ['bar'], 'id': ['id2']}, state={'ram': 65},
         version='123456789', quarantined=True, task_id=None, task_name=None)
     bot1 = {
       u'authenticated_as': u'bot:whitelisted-ip',
       u'bot_id': u'id1',
+      u'deleted': False,
       u'dimensions': [
         {u'key': u'foo', u'value': [u'bar']},
         {u'key': u'id', u'value': [u'id1']},
       ],
       u'external_ip': u'8.8.4.4',
       u'first_seen_ts': now_str,
       u'is_dead': False,
       u'last_seen_ts': now_str,
       u'quarantined': False,
       u'state': u'{"ram":65}',
       u'version': u'123456789',
     }
     bot2 = {
       u'authenticated_as': u'bot:whitelisted-ip',
       u'bot_id': u'id2',
+      u'deleted': False,
       u'dimensions': [
         {u'key': u'foo', u'value': [u'bar']},
         {u'key': u'id', u'value': [u'id2']},
       ],
       u'external_ip': u'8.8.4.4',
       u'first_seen_ts': now_str,
       u'is_dead': False,
       u'last_seen_ts': now_str,
       u'quarantined': True,
       u'state': u'{"ram":65}',
       u'version': u'123456789',
     }
     bot3 = {
       u'authenticated_as': u'bot:whitelisted-ip',
       u'bot_id': u'id3',
+      u'deleted': False,
       u'dimensions': [
         {u'key': u'foo', u'value': [u'bar']},
         {u'key': u'id', u'value': [u'id3']},
       ],
       u'external_ip': u'8.8.4.4',
       u'first_seen_ts': then_str,
       u'is_dead': True,
       u'last_seen_ts': then_str,
       u'quarantined': False,
       u'state': u'{"ram":65}',
@@ skipping 212 matching lines @@
     now_str = unicode(now.strftime(self.DATETIME_FORMAT))
     bot_management.bot_event(
         event_type='bot_connected', bot_id='id1',
         external_ip='8.8.4.4', authenticated_as='bot:whitelisted-ip',
         dimensions={'foo': ['bar'], 'id': ['id1']}, state={'ram': 65},
         version='123456789', quarantined=False, task_id=None, task_name=None)
 
     expected = {
       u'authenticated_as': u'bot:whitelisted-ip',
       u'bot_id': u'id1',
+      u'deleted': False,
       u'dimensions': [
         {u'key': u'foo', u'value': [u'bar']},
         {u'key': u'id', u'value': [u'id1']},
       ],
       u'external_ip': u'8.8.4.4',
       u'first_seen_ts': now_str,
       u'is_dead': False,
       u'last_seen_ts': now_str,
       u'quarantined': False,
       u'state': u'{"ram":65}',
@@ skipping 253 matching lines @@
     self.call_api('terminate', body={'bot_id': 'bot1'}, status=403)
 
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     unittest.TestCase.maxDiff = None
     logging.basicConfig(level=logging.DEBUG)
   else:
     logging.basicConfig(level=logging.CRITICAL)
   unittest.main()