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

Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Szeged
 # Copyright (C) 2011 Apple Inc. All rights reserved.
 #
 # 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.
@@ skipping 32 matching lines @@
 import webkitpy.thirdparty.unittest2 as unittest
 
 from webkitpy.common.system import outputcapture, path
 from webkitpy.common.system.crashlogs_unittest import make_mock_crash_report_darwin
 from webkitpy.common.system.systemhost import SystemHost
 from webkitpy.common.host import Host
 from webkitpy.common.host_mock import MockHost
 
 from webkitpy.layout_tests import port
 from webkitpy.layout_tests import run_webkit_tests
+from webkitpy.layout_tests.models.test_run_results import INTERRUPTED_EXIT_STATUS
 from webkitpy.layout_tests.port import Port
 from webkitpy.layout_tests.port import test
 from webkitpy.test.skip import skip_if
 from webkitpy.tool import grammar
 from webkitpy.tool.mocktool import MockOptions
 
 
 def parse_args(extra_args=None, tests_included=False, new_results=False, print_nothing=True):
     extra_args = extra_args or []
     args = []
@@ skipping 221 matching lines @@
 
     def test_full_results_html(self):
         host = MockHost()
         details, _, _ = logging_run(['--full-results-html'], host=host)
         self.assertEqual(details.exit_code, 0)
         self.assertEqual(len(host.user.opened_urls), 1)
 
     def test_keyboard_interrupt(self):
         # Note that this also tests running a test marked as SKIP if
         # you specify it explicitly.
-        self.assertRaises(KeyboardInterrupt, logging_run, ['failures/expected/keyboard.html', '--child-processes', '1'], tests_included=True)
+        details, _, _ = logging_run(['failures/expected/keyboard.html', '--child-processes', '1'], tests_included=True)
+        self.assertEqual(details.exit_code, INTERRUPTED_EXIT_STATUS)
 
         if self.should_test_processes:
-            self.assertRaises(KeyboardInterrupt, logging_run,
-                ['failures/expected/keyboard.html', 'passes/text.html', '--child-processes', '2', '--skipped=ignore'], tests_included=True, shared_port=False)
+            _, regular_output, _ = logging_run(['failures/expected/keyboard.html', 'passes/text.html', '--child-processes', '2', '--skipped=ignore'], tests_included=True, shared_port=False)
+            self.assertTrue(any(['Interrupted, exiting' in line for line in regular_output.buflist]))
 
     def test_no_tests_found(self):
         details, err, _ = logging_run(['resources'], tests_included=True)
         self.assertEqual(details.exit_code, -1)
         self.assertContains(err, 'No tests to run.\n')
 
     def test_no_tests_found_2(self):
         details, err, _ = logging_run(['foo'], tests_included=True)
         self.assertEqual(details.exit_code, -1)
         self.assertContains(err, 'No tests to run.\n')
@@ skipping 646 matching lines @@
             return FakeRunDetails()
 
         def exception_raising_run(port, options, args, stderr):
             assert False
 
         stdout = StringIO.StringIO()
         stderr = StringIO.StringIO()
         try:
             run_webkit_tests.run = interrupting_run
             res = run_webkit_tests.main([], stdout, stderr)
-            self.assertEqual(res, run_webkit_tests.INTERRUPTED_EXIT_STATUS)
+            self.assertEqual(res, INTERRUPTED_EXIT_STATUS)
 
             run_webkit_tests.run = successful_run
             res = run_webkit_tests.main(['--platform', 'test'], stdout, stderr)
             self.assertEqual(res, -1)
 
             run_webkit_tests.run = exception_raising_run
             res = run_webkit_tests.main([], stdout, stderr)
             self.assertEqual(res, run_webkit_tests.EXCEPTIONAL_EXIT_STATUS)
         finally:
             run_webkit_tests.run = orig_run_fn