Modified: trunk/Tools/ChangeLog (131343 => 131344)
--- trunk/Tools/ChangeLog 2012-10-15 20:05:36 UTC (rev 131343)
+++ trunk/Tools/ChangeLog 2012-10-15 20:11:41 UTC (rev 131344)
@@ -1,3 +1,18 @@
+2012-10-15 Ojan Vafai <o...@chromium.org>
+
+ Lower the minimum time required to keep a test in the test results json
+ https://bugs.webkit.org/show_bug.cgi?id=99346
+
+ Reviewed by Eric Seidel.
+
+ On the run-webkit-tests side, we floor the time. So, 5 seconds is too close to
+ the 6 second timeout. Lower the time so that we can get a better sense of tests
+ that are close to timing out.
+
+ * TestResultServer/model/jsonresults.py:
+ * TestResultServer/model/jsonresults_unittest.py:
+ (JsonResultsTest.test_merge_keep_test_with_all_pass_but_slow_time):
+
2012-10-15 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r131306 and r131307.
Modified: trunk/Tools/TestResultServer/model/jsonresults.py (131343 => 131344)
--- trunk/Tools/TestResultServer/model/jsonresults.py 2012-10-15 20:05:36 UTC (rev 131343)
+++ trunk/Tools/TestResultServer/model/jsonresults.py 2012-10-15 20:11:41 UTC (rev 131344)
@@ -46,7 +46,7 @@
JSON_RESULTS_PASS = "P"
JSON_RESULTS_SKIP = "X"
JSON_RESULTS_NO_DATA = "N"
-JSON_RESULTS_MIN_TIME = 5
+JSON_RESULTS_MIN_TIME = 3
JSON_RESULTS_HIERARCHICAL_VERSION = 4
JSON_RESULTS_MAX_BUILDS = 500
JSON_RESULTS_MAX_BUILDS_SMALL = 100
Modified: trunk/Tools/TestResultServer/model/jsonresults_unittest.py (131343 => 131344)
--- trunk/Tools/TestResultServer/model/jsonresults_unittest.py 2012-10-15 20:05:36 UTC (rev 131343)
+++ trunk/Tools/TestResultServer/model/jsonresults_unittest.py 2012-10-15 20:11:41 UTC (rev 131344)
@@ -474,7 +474,7 @@
{"builds": ["2", "1"],
"tests": {"001.html": {
"results": [[200,"P"]],
- "times": [[200,5]]},
+ "times": [[200,jsonresults.JSON_RESULTS_MIN_TIME]]},
"002.html": {
"results": [[10,"F"]],
"times": [[10,0]]}}},
@@ -490,7 +490,7 @@
{"builds": ["3", "2", "1"],
"tests": {"001.html": {
"results": [[201,"P"]],
- "times": [[1,1],[200,5]]},
+ "times": [[1,1],[200,jsonresults.JSON_RESULTS_MIN_TIME]]},
"002.html": {
"results": [[1,"P"],[10,"F"]],
"times": [[11,0]]}}})
