Make deleted bots still show up when searched for by id

appengine/swarming/server/bot_management_test.py

 #!/usr/bin/env python
 # Copyright 2014 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 datetime
 import hashlib
 import logging
 import sys
 import unittest
@@ skipping 27 matching lines @@
     now = datetime.datetime(2010, 1, 2, 3, 4, 5, 6)
     self.mock_now(now)
     bot_management.bot_event(
         event_type='bot_connected', bot_id='id1',
         external_ip='8.8.4.4', authenticated_as='bot:id1.domain',
         dimensions={'id': ['id1'], 'foo': ['bar']}, state={'ram': 65},
         version=hashlib.sha1().hexdigest(), quarantined=False, task_id=None,
         task_name=None)
 
     expected = {
-      'authenticated_as': 'bot:id1.domain',
+      'authenticated_as': u'bot:id1.domain',
       'composite': [8, 2],
+      'deleted': False,
       'dimensions': {u'foo': [u'bar'], u'id': [u'id1']},
       'external_ip': u'8.8.4.4',
       'first_seen_ts': now,
       'id': 'id1',
       'last_seen_ts': now,
       'lease_id': None,
       'lease_expiration_ts': None,
       'machine_type': None,
       'quarantined': False,
       'state': {u'ram': 65},
       'task_id': None,
       'task_name': None,
       'version': u'da39a3ee5e6b4b0d3255bfef95601890afd80709',
     }
     self.assertEqual(
         expected, bot_management.get_info_key('id1').get().to_dict())
 
   def test_get_events_query(self):
     now = datetime.datetime(2010, 1, 2, 3, 4, 5, 6)
     self.mock_now(now)
     bot_management.bot_event(
         event_type='bot_connected', bot_id='id1',
         external_ip='8.8.4.4', authenticated_as='bot:id1.domain',
         dimensions={'id': ['id1'], 'foo': ['bar']}, state={'ram': 65},
         version=hashlib.sha1().hexdigest(), quarantined=False, task_id=None,
         task_name=None)
     expected = [
       {
-        'authenticated_as': 'bot:id1.domain',
+        'authenticated_as': u'bot:id1.domain',
         'dimensions': {u'foo': [u'bar'], u'id': [u'id1']},
         'event_type': u'bot_connected',
         'external_ip': u'8.8.4.4',
         'lease_id': None,
         'lease_expiration_ts': None,
         'machine_type': None,
         'message': None,
         'quarantined': False,
         'state': {u'ram': 65},
         'task_id': None,
@@ skipping 10 matching lines @@
     self.mock_now(now)
     bot_management.bot_event(
         event_type='request_sleep', bot_id='id1',
         external_ip='8.8.4.4', authenticated_as='bot:id1.domain',
         dimensions={'id': ['id1'], 'foo': ['bar']}, state={'ram': 65},
         version=hashlib.sha1().hexdigest(), quarantined=True, task_id=None,
         task_name=None)
 
     # Assert that BotInfo was updated too.
     expected = {
-      'authenticated_as': 'bot:id1.domain',
+      'authenticated_as': u'bot:id1.domain',
       'composite': [4, 2],
+      'deleted': False,
       'dimensions': {u'foo': [u'bar'], u'id': [u'id1']},
       'external_ip': u'8.8.4.4',
       'first_seen_ts': now,
       'id': 'id1',
       'last_seen_ts': now,
       'lease_id': None,
       'lease_expiration_ts': None,
       'machine_type': None,
       'quarantined': True,
       'state': {u'ram': 65},
@@ skipping 11 matching lines @@
     now = datetime.datetime(2010, 1, 2, 3, 4, 5, 6)
     self.mock_now(now)
     bot_management.bot_event(
         event_type='request_task', bot_id='id1',
         external_ip='8.8.4.4', authenticated_as='bot:id1.domain',
         dimensions={'id': ['id1'], 'foo': ['bar']}, state={'ram': 65},
         version=hashlib.sha1().hexdigest(), quarantined=False, task_id='12311',
         task_name='yo')
 
     expected = {
-      'authenticated_as': 'bot:id1.domain',
+      'authenticated_as': u'bot:id1.domain',
       'composite': [8, 1],
+      'deleted': False,
       'dimensions': {u'foo': [u'bar'], u'id': [u'id1']},
       'external_ip': u'8.8.4.4',
       'first_seen_ts': now,
       'id': 'id1',
       'last_seen_ts': now,
       'lease_id': None,
       'lease_expiration_ts': None,
       'machine_type': None,
       'quarantined': False,
       'state': {u'ram': 65},
       'task_id': u'12311',
       'task_name': u'yo',
       'version': u'da39a3ee5e6b4b0d3255bfef95601890afd80709',
     }
     bot_info = bot_management.get_info_key('id1').get()
     self.assertEqual(expected, bot_info.to_dict())
 
     expected = [
       {
-        'authenticated_as': 'bot:id1.domain',
+        'authenticated_as': u'bot:id1.domain',
         'dimensions': {u'foo': [u'bar'], u'id': [u'id1']},
         'event_type': u'request_task',
         'external_ip': u'8.8.4.4',
         'lease_id': None,
         'lease_expiration_ts': None,
         'machine_type': None,
         'message': None,
         'quarantined': False,
         'state': {u'ram': 65},
         'task_id': u'12311',
@@ skipping 75 matching lines @@
   def test_filter_dimensions(self):
     pass # Tested in handlers_endpoints_test
 
   def test_filter_availability(self):
     pass # Tested in handlers_endpoints_test
 
 if __name__ == '__main__':
   logging.basicConfig(
       level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
   unittest.main()