Title: [100863] trunk/Tools
- Revision
- 100863
- Author
- [email protected]
- Date
- 2011-11-19 17:47:13 -0800 (Sat, 19 Nov 2011)
Log Message
Stop storing results files as jsonp in the test results server
https://bugs.webkit.org/show_bug.cgi?id=72814
Reviewed by Adam Barth.
* TestResultServer/model/jsonresults.py:
* TestResultServer/model/jsonresults_unittest.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (100862 => 100863)
--- trunk/Tools/ChangeLog 2011-11-20 01:13:19 UTC (rev 100862)
+++ trunk/Tools/ChangeLog 2011-11-20 01:47:13 UTC (rev 100863)
@@ -1,5 +1,15 @@
2011-11-19 Ojan Vafai <[email protected]>
+ Stop storing results files as jsonp in the test results server
+ https://bugs.webkit.org/show_bug.cgi?id=72814
+
+ Reviewed by Adam Barth.
+
+ * TestResultServer/model/jsonresults.py:
+ * TestResultServer/model/jsonresults_unittest.py:
+
+2011-11-19 Ojan Vafai <[email protected]>
+
Remove the dependence on jsonp from more of new-run-webkit-tests and the test results server
https://bugs.webkit.org/show_bug.cgi?id=72813
Modified: trunk/Tools/TestResultServer/model/jsonresults.py (100862 => 100863)
--- trunk/Tools/TestResultServer/model/jsonresults.py 2011-11-20 01:13:19 UTC (rev 100862)
+++ trunk/Tools/TestResultServer/model/jsonresults.py 2011-11-20 01:47:13 UTC (rev 100863)
@@ -60,8 +60,7 @@
@classmethod
def _generate_file_data(cls, json, sort_keys=False):
- data = "" separators=(',', ':'), sort_keys=sort_keys)
- return JSON_RESULTS_PREFIX + data + JSON_RESULTS_SUFFIX
+ return simplejson.dumps(json, separators=(',', ':'), sort_keys=sort_keys)
@classmethod
def _load_json(cls, file_data):
Modified: trunk/Tools/TestResultServer/model/jsonresults_unittest.py (100862 => 100863)
--- trunk/Tools/TestResultServer/model/jsonresults_unittest.py 2011-11-20 01:13:19 UTC (rev 100862)
+++ trunk/Tools/TestResultServer/model/jsonresults_unittest.py 2011-11-20 01:47:13 UTC (rev 100863)
@@ -70,9 +70,6 @@
'"results":[[TESTDATA_TEST_RESULTS]],'
'"times":[[TESTDATA_TEST_TIMES]]}')
-JSON_RESULTS_PREFIX = "ADD_RESULTS("
-JSON_RESULTS_SUFFIX = ");"
-
JSON_RESULTS_TEST_LIST_TEMPLATE = (
'{"Webkit":{"tests":{[TESTDATA_TESTS]}}}')
@@ -83,17 +80,17 @@
def test_strip_prefix_suffix(self):
json = "['contents']"
- self.assertEqual(JsonResults._strip_prefix_suffix(JSON_RESULTS_PREFIX + json + JSON_RESULTS_SUFFIX), json)
+ self.assertEqual(JsonResults._strip_prefix_suffix("ADD_RESULTS(" + json + ");"), json)
self.assertEqual(JsonResults._strip_prefix_suffix(json), json)
def _make_test_json(self, test_data):
if not test_data:
- return JSON_RESULTS_PREFIX + JSON_RESULTS_SUFFIX
+ return ""
builds = test_data["builds"]
tests = test_data["tests"]
if not builds or not tests:
- return JSON_RESULTS_PREFIX + JSON_RESULTS_SUFFIX
+ return ""
json = JSON_RESULTS_TEMPLATE
@@ -127,7 +124,7 @@
json = json.replace("[TESTDATA_TESTS]", ",".join(json_tests))
- return JSON_RESULTS_PREFIX + json + JSON_RESULTS_SUFFIX
+ return json
def _parse_tests_dict(self, name, test):
if "results" in test:
@@ -161,10 +158,7 @@
for test in expected_data:
json_tests.append("\"" + test + "\":{}")
- expected_results = (JSON_RESULTS_PREFIX +
- JSON_RESULTS_TEST_LIST_TEMPLATE.replace("[TESTDATA_TESTS]", ",".join(json_tests)) +
- JSON_RESULTS_SUFFIX)
-
+ expected_results = JSON_RESULTS_TEST_LIST_TEMPLATE.replace("[TESTDATA_TESTS]", ",".join(json_tests))
actual_results = JsonResults.get_test_list(self._builder, input_results)
self.assertEquals(actual_results, expected_results)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
