Changeset 90416 in webkit

Timestamp:

Jul 5, 2011 4:56:41 PM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-07-05 Adam Barth <​abarth@webkit.org>

TestResultServer should support callback parameter for JSON
​https://bugs.webkit.org/show_bug.cgi?id=63961

Reviewed by Ojan Vafai.

This makes using jQuery.ajax so much more pleasant.

• TestResultServer/handlers/testfilehandler.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestResultServer/handlers/testfilehandler.py (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-05  Adam Barth  <abarth@webkit.org>
+
+        TestResultServer should support callback parameter for JSON
+        https://bugs.webkit.org/show_bug.cgi?id=63961
+
+        Reviewed by Ojan Vafai.
+
+        This makes using jQuery.ajax so much more pleasant.
+
+        * TestResultServer/handlers/testfilehandler.py:
+
 2011-07-05  Eric Seidel  <eric@webkit.org>
 

trunk/Tools/TestResultServer/handlers/testfilehandler.py

@@ -28 +28 @@
 
 import logging
+import re
 import urllib
 
@@ -46 +47 @@
 PARAM_INCREMENTAL = "incremental"
 PARAM_TEST_LIST_JSON = "testlistjson"
+PARAM_CALLBACK = "callback"
 
 
@@ -140 +142 @@
         dir = self.request.get(PARAM_DIR)
         test_list_json = self.request.get(PARAM_TEST_LIST_JSON)
+        callback_name = self.request.get(PARAM_CALLBACK)
 
         logging.debug(
@@ -156 +159 @@
             json = self._get_file_content(master, builder, test_type, name)
 
+        if callback_name and re.search(r"^[A-Za-z_]+$", callback_name):
+            json = re.sub(r"^[A-Za-z_]+[(]", callback_name + "(", json)
+
         if json:
-            self.response.headers["Content-Type"] = "text/plain; charset=utf-8"
+            self.response.headers["Content-Type"] = "application/json"
             self.response.out.write(json)
         else: