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
@@ skipping 191 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)):
+            if initial_results.interrupted:
+                _INTERRUPTED_EXIT_STATUS = signal.SIGINT + 128
+                exit_code = _INTERRUPTED_EXIT_STATUS
+            elif 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/08/29 17:04:26]

I think we probably shouldn't print the results if the run was manually
interrupted, but I'm not 100% certain of this.

Context: the basic idea behind the way I implemented the keyboard-interrupt
support was to exit as quickly as possible while still exiting cleanly and to do
what amount of work still seemed to be sensible (w/o blocking). So, I didn't
create the results.html file or print things because it was slow and because it
might not make sense. I think creating the results probably isn't actually that
slow, and I can see the argument that it makes sense in some or maybe even most
cases. However, I doubt printing the results make sense (even if it's not slow).

         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