run-webkit-tests should submit time and modifiers to the new flakiness dashboard

rniwa · rniwa · commit e202bbb3a88b · 2013-10-19T23:38:14.000Z
https://bugs.webkit.org/show_bug.cgi?id=123070 Reviewed by Alexey Proskuryakov. * Scripts/webkitpy/layout_tests/controllers/manager.py: (Manager.run): * Scripts/webkitpy/layout_tests/models/test_run_results.py: (summarize_results): Added include_time_and_modifiers. Report test_run_time and modifiers in the test expectations when this argument is set to true. Canonical link: https://commits.webkit.org/141148@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@157687 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+2013-10-19  Ryosuke Niwa  <rniwa@webkit.org>
+
+        run-webkit-tests should submit time and modifiers to the new flakiness dashboard
+        https://bugs.webkit.org/show_bug.cgi?id=123070
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Scripts/webkitpy/layout_tests/controllers/manager.py:
+        (Manager.run):
+        * Scripts/webkitpy/layout_tests/models/test_run_results.py:
+        (summarize_results): Added include_time_and_modifiers. Report test_run_time and modifiers
+        in the test expectations when this argument is set to true.
+
 2013-10-19  Alexey Proskuryakov  <ap@apple.com>
 
         Mac DumpRenderTree builds without NDEBUG even in release mode
diff --git a/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py b/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
@@ -228,7 +228,7 @@ def run(self, args):
         summarized_results = test_run_results.summarize_results(self._port, self._expectations, initial_results, retry_results, enabled_pixel_tests_in_retry)
         results_including_passes = None
         if self._options.results_server_host:
-            results_including_passes = test_run_results.summarize_results(self._port, self._expectations, initial_results, retry_results, enabled_pixel_tests_in_retry, include_passes=True)
+            results_including_passes = test_run_results.summarize_results(self._port, self._expectations, initial_results, retry_results, enabled_pixel_tests_in_retry, include_passes=True, include_time_and_modifiers=True)
         self._printer.print_results(end_time - start_time, initial_results, summarized_results)
 
         if not self._options.dry_run:
diff --git a/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py b/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py
@@ -118,7 +118,7 @@ def _interpret_test_failures(failures):
     return test_dict
 
 
-def summarize_results(port_obj, expectations, initial_results, retry_results, enabled_pixel_tests_in_retry, include_passes=False):
+def summarize_results(port_obj, expectations, initial_results, retry_results, enabled_pixel_tests_in_retry, include_passes=False, include_time_and_modifiers=False):
     """Returns a dictionary containing a summary of the test runs, with the following fields:
         'version': a version indicator
         'fixable': The number of fixable tests (NOW - PASS)
@@ -201,6 +201,10 @@ def summarize_results(port_obj, expectations, initial_results, retry_results, en
 
         test_dict['expected'] = expected
         test_dict['actual'] = " ".join(actual)
+        if include_time_and_modifiers:
+            test_dict['time'] = round(1000 * result.test_run_time)
+            # FIXME: Fix get_modifiers to return modifiers in new format.
+            test_dict['modifiers'] = ' '.join(expectations.get_modifiers(test_name)).replace('BUGWK', 'webkit.org/b/')
 
         test_dict.update(_interpret_test_failures(result.failures))
 
