chromium-cq-status: StatsTest utility class for testing CQ stats

appengine/chromium_cq_status/handlers/query.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import json
 
 from google.appengine.datastore.datastore_query import Cursor
 import webapp2
 
 from shared.config import MAXIMUM_QUERY_SIZE
 from shared.parsing import (
   parse_cursor,
   parse_url_tags,
   parse_fields,
   parse_key,
   parse_non_negative_integer,
   parse_request,
   parse_tags,
   parse_timestamp,
   use_default,
 )
-from shared.utils import to_unix_timestamp
 from model.record import Record # pylint: disable-msg=E0611
 
 def execute_query(
     key, begin, end, tags, fields, count, cursor): # pragma: no cover
   count = min(count, MAXIMUM_QUERY_SIZE)
 
   records = []
   next_cursor = ''
   if key and count > 0:
     record = Record.get_by_id(key)
@@ skipping 15 matching lines @@
       for tag in tags:
         filters.append(Record.tags == tag)
       query = Record.query().filter(*filters).order(-Record.timestamp)
       page_records, next_cursor, more = query.fetch_page(count - len(records),
           start_cursor=Cursor(urlsafe=next_cursor or cursor))
       next_cursor = next_cursor.urlsafe() if next_cursor else ''
       for record in page_records:
         if matches_fields(fields, record):
           records.append(record)
 
-  results = []
-  for record in records:
-    result = record.to_dict(exclude=['timestamp'])
-    result['timestamp'] = to_unix_timestamp(record.timestamp)
-    record_key = record.key.id()
-    result['key'] = record_key if type(record_key) != long else None
-    results.append(result)
-
   return {
-    'results': results,
+    'results': [record.to_dict() for record in records],
     'cursor': next_cursor,
     'more': more,
   }
 
 def matches_fields(fields, record): # pragma: no cover
   for field, value in fields.items():
     if not field in record.fields or record.fields[field] != value:
       return False
   return True
 
@@ skipping 11 matching lines @@
       })
       data['tags'].extend(parse_url_tags(url_tags))
     except ValueError, e:
       self.response.write(e)
       return
 
     results = execute_query(**data)
     self.response.headers.add_header("Access-Control-Allow-Origin", "*")
     self.response.headers.add_header('Content-Type', 'application/json')
     json.dump(results, self.response)