Title: [122154] trunk/Tools
- Revision
- 122154
- Author
- [email protected]
- Date
- 2012-07-09 13:46:29 -0700 (Mon, 09 Jul 2012)
Log Message
Handle missing results in TestResultsServer better
https://bugs.webkit.org/show_bug.cgi?id=90816
Reviewed by Ojan Vafai.
If we can't load the results JSON, don't try to wrap it with the JSONP
callback invocation.
* TestResultServer/handlers/testfilehandler.py:
(GetFile.get):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (122153 => 122154)
--- trunk/Tools/ChangeLog 2012-07-09 20:46:07 UTC (rev 122153)
+++ trunk/Tools/ChangeLog 2012-07-09 20:46:29 UTC (rev 122154)
@@ -1,3 +1,16 @@
+2012-07-09 Mihai Parparita <[email protected]>
+
+ Handle missing results in TestResultsServer better
+ https://bugs.webkit.org/show_bug.cgi?id=90816
+
+ Reviewed by Ojan Vafai.
+
+ If we can't load the results JSON, don't try to wrap it with the JSONP
+ callback invocation.
+
+ * TestResultServer/handlers/testfilehandler.py:
+ (GetFile.get):
+
2012-07-09 Sheriff Bot <[email protected]>
Unreviewed, rolling out r122124.
Modified: trunk/Tools/TestResultServer/handlers/testfilehandler.py (122153 => 122154)
--- trunk/Tools/TestResultServer/handlers/testfilehandler.py 2012-07-09 20:46:07 UTC (rev 122153)
+++ trunk/Tools/TestResultServer/handlers/testfilehandler.py 2012-07-09 20:46:29 UTC (rev 122154)
@@ -203,9 +203,12 @@
else:
json, date = self._get_file_content(master, builder, test_type, name)
- self._serve_json(_replace_jsonp_callback(json, callback_name), date)
+ if json:
+ json = _replace_jsonp_callback(json, callback_name)
+ self._serve_json(json, date)
+
class Upload(webapp.RequestHandler):
"""Upload test results file to datastore."""
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
