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..bfd6b4a8eacbef5abed6dae13ea49a119d7715cf 100644 |
--- a/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py |
+++ b/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py |
@@ -50,6 +50,7 @@ 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 |
@@ -291,11 +292,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, 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) |
@@ -962,7 +964,7 @@ class MainTest(unittest.TestCase): |
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) |