User interruption should still create results.html for run-webkit-tests.

Tools/Scripts/webkitpy/layout_tests/controllers/manager.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Szeged
 #
 # 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
@@ skipping 20 matching lines @@
 The Manager runs a series of tests (TestType interface) against a set
 of test files.  If a test file fails a TestType, it returns a list of TestFailure
 objects to the Manager. The Manager then aggregates the TestFailures to
 create a final report.
 """
 
 import datetime
 import json
 import logging
 import random
+import signal
 import sys
 import time
 
 from webkitpy.common.net.file_uploader import FileUploader
 from webkitpy.layout_tests.controllers.layout_test_finder import LayoutTestFinder
 from webkitpy.layout_tests.controllers.layout_test_runner import LayoutTestRunner
 from webkitpy.layout_tests.controllers.test_result_writer import TestResultWriter
 from webkitpy.layout_tests.layout_package import json_results_generator
 from webkitpy.layout_tests.models import test_expectations
 from webkitpy.layout_tests.models import test_failures
 from webkitpy.layout_tests.models import test_run_results
 from webkitpy.layout_tests.models.test_input import TestInput
 
+# This mirrors what the shell normally does.
+INTERRUPTED_EXIT_STATUS = signal.SIGINT + 128
+
 _log = logging.getLogger(__name__)
 
 # Builder base URL where we have the archived test results.
 BUILDER_BASE_URL = "http://build.chromium.org/buildbot/layout_test_results/"
 
 TestExpectations = test_expectations.TestExpectations
 
 
 
 class Manager(object):
@@ skipping 178 matching lines @@
         summarized_full_results = test_run_results.summarize_results(self._port, self._expectations, initial_results, retry_results, enabled_pixel_tests_in_retry)
         summarized_failing_results = test_run_results.summarize_results(self._port, self._expectations, initial_results, retry_results, enabled_pixel_tests_in_retry, only_include_failing=True)
 
         exit_code = summarized_failing_results['num_regressions']
         if not self._options.dry_run:
             self._write_json_files(summarized_full_results, summarized_failing_results, initial_results)
             self._upload_json_files()
 
             results_path = self._filesystem.join(self._results_directory, "results.html")
             self._copy_results_html_file(results_path)
-            if self._options.show_results and (exit_code or (self._options.full_results_html and initial_results.total_failures)):
-                self._port.show_results_html_file(results_path)
-
-        self._printer.print_results(time.time() - start_time, initial_results, summarized_failing_results)
+            if initial_results.interrupted:
+                exit_code = INTERRUPTED_EXIT_STATUS
+            else:
+                if self._options.show_results and (exit_code or (self._options.full_results_html and initial_results.total_failures)):
+                    self._port.show_results_html_file(results_path)
+                self._printer.print_results(time.time() - start_time, initial_results, summarized_failing_results)

[Dirk Pranke, 2013/09/03 20:55:27]

I see that you've changed this so that printer.print_results() is only called if
we weren't interrupted (as a result of my prior comment).

I think this will be fine. However, we also print out  results to stdout for the
buildbot to parse in run_webkit_tests.py:77-79 , and so we'll still execute that
on a ctrl-C, I think.

The catch here is that the run_webkit_tests.py lines *have* to be printed on the
bots if we exit early because of too many errors, but locally, we probably don't
want this printed out if we do a ctrl-C. That would require you to be able to
distinguish the two cases. 

I'm not sure if we really need to fix this or not; mostly it depends on how
annoying the extra logging will be. Can you take a quick look and see what you
think (and whether it's relatively easy to fix)? If not, I'm okay w/ landing
this patch as-is and revisiting separately if we need to fix that.

         return test_run_results.RunDetails(exit_code, summarized_full_results, summarized_failing_results, initial_results, retry_results, enabled_pixel_tests_in_retry)
 
     def _run_tests(self, tests_to_run, tests_to_skip, repeat_each, iterations, num_workers, retrying):
 
         test_inputs = []
         for _ in xrange(iterations):
             for test in tests_to_run:
                 for _ in xrange(repeat_each):
                     test_inputs.append(self._test_input_for_file(test))
         return self._runner.run_tests(self._expectations, test_inputs, tests_to_skip, num_workers, retrying)
@@ skipping 149 matching lines @@
             return int(worker_name.split('/')[1]) if worker_name else -1
 
         stats = {}
         for result in initial_results.results_by_name.values():
             if result.type != test_expectations.SKIP:
                 stats[result.test_name] = {'results': (_worker_number(result.worker_name), result.test_number, result.pid, int(result.test_run_time * 1000), int(result.total_run_time * 1000))}
         stats_trie = {}
         for name, value in stats.iteritems():
             json_results_generator.add_path_to_trie(name, value, stats_trie)
         return stats_trie