Revert "Change TestResultServer to use python 2.7."

Tools/TestResultServer/model/jsonresults_unittest.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 15 matching lines @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 try:
     import jsonresults
     from jsonresults import JsonResults
 except ImportError:
     print "ERROR: Add the TestResultServer, google_appengine and yaml/lib directories to your PYTHONPATH"
     raise
 
-import json
+from django.utils import simplejson
+
 import unittest
 
 
 JSON_RESULTS_TEMPLATE = (
     '{"Webkit":{'
     '"allFixableCount":[[TESTDATA_COUNT]],'
     '"buildNumbers":[[TESTDATA_BUILDNUMBERS]],'
     '"chromeRevision":[[TESTDATA_CHROMEREVISION]],'
     '"deferredCounts":[[TESTDATA_COUNTS]],'
     '"fixableCount":[[TESTDATA_COUNT]],'
@@ skipping 26 matching lines @@
 
 JSON_RESULTS_TEST_LIST_TEMPLATE = (
     '{"Webkit":{"tests":{[TESTDATA_TESTS]}}}')
 
 
 class JsonResultsTest(unittest.TestCase):
     def setUp(self):
         self._builder = "Webkit"
 
     def test_strip_prefix_suffix(self):
-        json_string = "['contents']"
-        self.assertEqual(JsonResults._strip_prefix_suffix("ADD_RESULTS(" + json_string + ");"), json_string)
-        self.assertEqual(JsonResults._strip_prefix_suffix(json_string), json_string)
+        json = "['contents']"
+        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 ""
 
         builds = test_data["builds"]
         tests = test_data["tests"]
         if not builds or not tests:
             return ""
 
-        json_string = JSON_RESULTS_TEMPLATE
+        json = JSON_RESULTS_TEMPLATE
 
         counts = []
         build_numbers = []
         webkit_revision = []
         chrome_revision = []
         times = []
         for build in builds:
             counts.append(JSON_RESULTS_COUNTS_TEMPLATE.replace("[TESTDATA]", build))
             build_numbers.append("1000%s" % build)
             webkit_revision.append("2000%s" % build)
             chrome_revision.append("3000%s" % build)
             times.append("100000%s000" % build)
 
-        json_string = json_string.replace("[TESTDATA_COUNTS]", ",".join(counts))
-        json_string = json_string.replace("[TESTDATA_COUNT]", ",".join(builds))
-        json_string = json_string.replace("[TESTDATA_BUILDNUMBERS]", ",".join(build_numbers))
-        json_string = json_string.replace("[TESTDATA_WEBKITREVISION]", ",".join(webkit_revision))
-        json_string = json_string.replace("[TESTDATA_CHROMEREVISION]", ",".join(chrome_revision))
-        json_string = json_string.replace("[TESTDATA_TIMES]", ",".join(times))
+        json = json.replace("[TESTDATA_COUNTS]", ",".join(counts))
+        json = json.replace("[TESTDATA_COUNT]", ",".join(builds))
+        json = json.replace("[TESTDATA_BUILDNUMBERS]", ",".join(build_numbers))
+        json = json.replace("[TESTDATA_WEBKITREVISION]", ",".join(webkit_revision))
+        json = json.replace("[TESTDATA_CHROMEREVISION]", ",".join(chrome_revision))
+        json = json.replace("[TESTDATA_TIMES]", ",".join(times))
 
         version = str(test_data["version"]) if "version" in test_data else "4"
-        json_string = json_string.replace("[VERSION]", version)
-        json_string = json_string.replace("{[TESTDATA_TESTS]}", json.dumps(tests, separators=(',', ':'), sort_keys=True))
-        return json_string
+        json = json.replace("[VERSION]", version)
+        json = json.replace("{[TESTDATA_TESTS]}", simplejson.dumps(tests, separators=(',', ':'), sort_keys=True))
+        return json
 
     def _test_merge(self, aggregated_data, incremental_data, expected_data, max_builds=jsonresults.JSON_RESULTS_MAX_BUILDS):
         aggregated_results = self._make_test_json(aggregated_data)
         incremental_results = self._make_test_json(incremental_data)
         merged_results = JsonResults.merge(self._builder, aggregated_results, incremental_results, max_builds, sort_keys=True)
 
         if expected_data:
             expected_results = self._make_test_json(expected_data)
             self.assertEqual(merged_results, expected_results)
         else:
             self.assertFalse(merged_results)
 
     def _test_get_test_list(self, input_data, expected_data):
         input_results = self._make_test_json(input_data)
-        expected_results = JSON_RESULTS_TEST_LIST_TEMPLATE.replace("{[TESTDATA_TESTS]}", json.dumps(expected_data, separators=(',', ':')))
+        expected_results = JSON_RESULTS_TEST_LIST_TEMPLATE.replace("{[TESTDATA_TESTS]}", simplejson.dumps(expected_data, separators=(',', ':')))
         actual_results = JsonResults.get_test_list(self._builder, input_results)
         self.assertEqual(actual_results, expected_results)
 
     def test_merge_null_incremental_results(self):
         # Empty incremental results json.
         # Nothing to merge.
         self._test_merge(
             # Aggregated results
             {"builds": ["2", "1"],
              "tests": {"001.html": {
@@ skipping 542 matching lines @@
                            "results": [[101,"I"]],
                            "times": [[101,0]]},
                        "foo.bar3": {
                            "results": [[1,"F"]],
                            "times": [[1,0]]},
                        },
              "version": 4})
 
 if __name__ == '__main__':
     unittest.main()