| Index: Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py
|
| diff --git a/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py b/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py
|
| index df65f7dda022ed78d4994128eee6e7a333699ae3..31d86b8d345ce9d901a1822067adda3981cca354 100644
|
| --- a/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py
|
| +++ b/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py
|
| @@ -291,11 +291,12 @@ class RunTest(unittest.TestCase, StreamTestingMixin):
|
| 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, run_webkit_tests.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)
|
|
|