| Index: Tools/TestResultServer/handlers/testfilehandler.py
|
| diff --git a/Tools/TestResultServer/handlers/testfilehandler.py b/Tools/TestResultServer/handlers/testfilehandler.py
|
| index 9fe16a0d34a25af163352797f084ffd72ea8b684..90bff6b6eae77f8c3d0cf9550f1f62747df214ca 100644
|
| --- a/Tools/TestResultServer/handlers/testfilehandler.py
|
| +++ b/Tools/TestResultServer/handlers/testfilehandler.py
|
| @@ -51,6 +51,7 @@ PARAM_BEFORE = "before"
|
| PARAM_NUM_FILES = "numfiles"
|
| PARAM_KEY = "key"
|
| PARAM_TEST_TYPE = "testtype"
|
| +PARAM_TEST_LIST_JSON = "testlistjson"
|
| PARAM_CALLBACK = "callback"
|
|
|
|
|
| @@ -154,6 +155,21 @@ class GetFile(webapp2.RequestHandler):
|
| file.load_data()
|
| return file.data, file.date
|
|
|
| + def _get_test_list_json(self, master, builder, test_type, build_number):
|
| + """Return json file with test name list only, do not include test
|
| + results and other non-test-data .
|
| +
|
| + Args:
|
| + builder: builder name.
|
| + test_type: type of test results.
|
| + """
|
| +
|
| + json, date = self._get_file_content(master, builder, test_type, build_number, "results.json")
|
| + if not json:
|
| + return None
|
| +
|
| + return JsonResults.get_test_list(builder, json), date
|
| +
|
| def _serve_json(self, json, modified_date):
|
| if json:
|
| if "If-Modified-Since" in self.request.headers:
|
| @@ -180,6 +196,7 @@ class GetFile(webapp2.RequestHandler):
|
| name = self.request.get(PARAM_NAME)
|
| before = self.request.get(PARAM_BEFORE)
|
| num_files = self.request.get(PARAM_NUM_FILES)
|
| + test_list_json = self.request.get(PARAM_TEST_LIST_JSON)
|
| callback_name = self.request.get(PARAM_CALLBACK)
|
|
|
| logging.debug(
|
| @@ -188,6 +205,8 @@ class GetFile(webapp2.RequestHandler):
|
|
|
| if key:
|
| json, date = self._get_file_content_from_key(key)
|
| + elif test_list_json:
|
| + json, date = self._get_test_list_json(master, builder, test_type, build_number)
|
| elif num_files or not master or not builder or not test_type or (not build_number and not JsonResults.is_aggregate_file(name)) or not name:
|
| limit = int(num_files) if num_files else 100
|
| self._get_file_list(master, builder, test_type, build_number, name, before, limit, callback_name)
|
|
|