Changeset 100863 in webkit

Timestamp:

Nov 19, 2011 5:47:13 PM (12 years ago)

Author:

ojan@chromium.org

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:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestResultServer/model/jsonresults.py (modified) (1 diff)
• TestResultServer/model/jsonresults_unittest.py (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-11-19  Ojan Vafai  <ojan@chromium.org>
+
+        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  <ojan@chromium.org>
 

trunk/Tools/TestResultServer/model/jsonresults.py

@@ -61 +61 @@
     @classmethod
     def _generate_file_data(cls, json, sort_keys=False):
-        data = simplejson.dumps(json, separators=(',', ':'), sort_keys=sort_keys)
-        return JSON_RESULTS_PREFIX + data + JSON_RESULTS_SUFFIX
+        return simplejson.dumps(json, separators=(',', ':'), sort_keys=sort_keys)
 
     @classmethod

trunk/Tools/TestResultServer/model/jsonresults_unittest.py

@@ -71 +71 @@
     '"times":[[TESTDATA_TEST_TIMES]]}')
 
-JSON_RESULTS_PREFIX = "ADD_RESULTS("
-JSON_RESULTS_SUFFIX = ");"
-
 JSON_RESULTS_TEST_LIST_TEMPLATE = (
     '{"Webkit":{"tests":{[TESTDATA_TESTS]}}}')
@@ -84 +81 @@
     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
@@ -128 +125 @@
         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):
@@ -162 +159 @@
             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)