Changeset 86063 in webkit

Timestamp:

May 9, 2011 10:32:50 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-05-09 Alice Boxhall <​aboxhall@chromium.org>

Reviewed by Ojan Vafai.

Pull jsonresults_unittest test cases out into separate test methods.
​https://bugs.webkit.org/show_bug.cgi?id=60418

• TestResultServer/model/jsonresults_unittest.py:

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-09  Alice Boxhall  <aboxhall@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        Pull jsonresults_unittest test cases out into separate test methods.
+        https://bugs.webkit.org/show_bug.cgi?id=60418
+
+        * TestResultServer/model/jsonresults_unittest.py:
+
 2011-05-09  Mahesh Kulkarni  <mahesh.kulkarni@nokia.com>
 

trunk/Tools/TestResultServer/model/jsonresults_unittest.py

@@ -147 +147 @@
         self.assertEquals(actual_results, expected_results)
 
-    def test(self):
+    def test_merge_null_incremental_results(self):
         # Empty incremental results json.
         # Nothing to merge.
@@ -158 +158 @@
             None)
 
+    def test_merge_empty_incremental_results(self):
         # No actual incremental test results (only prefix and suffix) to merge.
         # Nothing to merge.
@@ -168 +169 @@
             None)
 
+    def test_merge_empty_aggregated_results(self):
         # No existing aggregated results.
         # Merged results == new incremental results.
@@ -178 +180 @@
             (["2", "1"], [["001.html", "[200,\"F\"]", "[200,0]"]]))
 
-        # Single test for single run.
+    def test_merge_incremental_single_test_single_run_same_result(self):
         # Incremental results has the latest build and same test results for
         # that run.
         # Insert the incremental results at the first place and sum number
-        # of runs for "P" (200 + 1) to get merged results.
+        # of runs for "F" (200 + 1) to get merged results.
         self._test_merge(
             # Aggregated results
@@ -191 +193 @@
             (["3", "2", "1"], [["001.html", "[201,\"F\"]", "[201,0]"]]))
 
-        # Single test for single run.
+    def test_merge_single_test_single_run_different_result(self):
         # Incremental results has the latest build but different test results
         # for that run.
@@ -203 +205 @@
             (["3", "2", "1"], [["001.html", "[1,\"I\"],[200,\"F\"]", "[1,1],[200,0]"]]))
 
-        # Single test for single run.
-        # Incremental results has the latest build but different test results
-        # for that run.
+    def test_merge_single_test_single_run_result_changed(self):
+        # Incremental results has the latest build but results which differ from
+        # the latest result (but are the same as an older result).
         self._test_merge(
             # Aggregated results
@@ -214 +216 @@
             (["3", "2", "1"], [["001.html", "[1,\"I\"],[200,\"F\"],[10,\"I\"]", "[1,1],[200,0],[10,1]"]]))
 
-        # Multiple tests for single run.
+    def test_merge_multiple_tests_single_run(self):
         # All tests have incremental updates.
         self._test_merge(
@@ -224 +226 @@
             (["3", "2", "1"], [["001.html", "[201,\"F\"]", "[201,0]"], ["002.html", "[101,\"I\"]", "[101,1]"]]))
 
-        # Multiple tests for single run.
+    def test_merge_multiple_tests_single_run_one_no_result(self):
         self._test_merge(
             # Aggregated results
@@ -233 +235 @@
             (["3", "2", "1"], [["001.html", "[1,\"N\"],[200,\"F\"]", "[201,0]"], ["002.html", "[101,\"I\"]", "[101,1]"]]))
 
-        # Single test for multiple runs.
+    def test_merge_single_test_multiple_runs(self):
         self._test_merge(
             # Aggregated results
@@ -242 +244 @@
             (["4", "3", "2", "1"], [["001.html", "[2,\"I\"],[200,\"F\"]", "[2,2],[200,0]"]]))
 
-        # Multiple tests for multiple runs.
+    def test_merge_multiple_tests_multiple_runs(self):
         self._test_merge(
             # Aggregated results
@@ -251 +253 @@
             (["4", "3", "2", "1"], [["001.html", "[2,\"I\"],[200,\"F\"]", "[2,2],[200,0]"], ["002.html", "[1,\"C\"],[10,\"Z\"]", "[1,1],[10,0]"]]))
 
+    def test_merge_incremental_result_older_build(self):
         # Test the build in incremental results is older than the most recent
         # build in aggregated results.
@@ -262 +265 @@
             None)
 
+    def test_merge_incremental_result_same_build(self):
         # Test the build in incremental results is same as the build in
         # aggregated results.
@@ -273 +277 @@
             None)
 
+    def test_merge_remove_test_with_no_data(self):
         # Remove test where there is no data in all runs.
         self._test_merge(
@@ -282 +287 @@
             (["3", "2", "1"], [["002.html", "[1,\"P\"],[10,\"F\"]", "[11,0]"]]))
 
+    def test_merge_remove_test_with_all_pass(self):
         # Remove test where all run pass and max running time < 1 seconds
         self._test_merge(
@@ -291 +297 @@
             (["3", "2", "1"], [["002.html", "[1,\"P\"],[10,\"F\"]", "[11,0]"]]))
 
+    def test_merge_keep_test_with_all_pass_but_slow_time(self):
         # Do not remove test where all run pass but max running time >= 1 seconds
         self._test_merge(
@@ -300 +307 @@
             (["3", "2", "1"], [["001.html", "[201,\"P\"]", "[1,1],[200,0]"], ["002.html", "[1,\"P\"],[10,\"F\"]", "[11,0]"]]))
 
+    def test_merge_prune_extra_results(self):
         # Remove items from test results and times that exceed the max number
         # of builds to track.
@@ -311 +319 @@
             (["3", "2", "1"], [["001.html", "[1,\"T\"],[" + max_builds + ",\"F\"]", "[1,1],[" + max_builds + ",0]"]]))
 
+    def test_merge_prune_extra_results_small(self):
         # Remove items from test results and times that exceed the max number
         # of builds to track, using smaller threshold.
@@ -323 +332 @@
             int(max_builds))
 
+    def test_merge_prune_extra_results_with_new_result_of_same_type(self):
         # Test that merging in a new result of the same type as the last result
         # causes old results to fall off.
@@ -335 +345 @@
             int(max_builds))
 
+    def test_get_test_name_list(self):
         # Get test name list only. Don't include non-test-list data and
         # of test result details.