diff --git a/avocado/job.py b/avocado/job.py index 378f032cfdafdbdda24b54400e7759088a5cbc0c..e430eebd5ad45f41cc84c6820490f54b74a7850f 100644 --- a/avocado/job.py +++ b/avocado/job.py @@ -136,7 +136,7 @@ class TestRunner(object): def interrupt_handler(signum, frame): e_msg = "Test %s interrupted by user" % instance - raise exceptions.TestTimeoutError(e_msg) + raise exceptions.TestInterruptedError(e_msg) signal.signal(signal.SIGUSR1, timeout_handler) signal.signal(signal.SIGINT, interrupt_handler) @@ -259,6 +259,10 @@ class TestRunner(object): 'Test aborted unexpectedly', test_state['name']) + # don't process other tests from the list + if ctrl_c_count > 0: + break + self.result.check_test(test_state) if not status.mapping[test_state['status']]: failures.append(test_state['name'])