diff --git a/avocado/loader.py b/avocado/loader.py index f610297fb5accadd4c8101f8383d6fe5c6f8c22c..b0f2a5f8c6aa669842ec4ffc50b75277a267b2ce 100644 --- a/avocado/loader.py +++ b/avocado/loader.py @@ -135,7 +135,9 @@ class TestLoader(object): # Since a lot of things can happen here, the broad exception is # justified. The user will get it unadulterated anyway, and avocado # will not crash. - except Exception, details: + except BaseException, details: # Ugly python files can raise any exc + if isinstance(details, KeyboardInterrupt): + raise # Don't ignore ctrl+c if os.access(test_path, os.X_OK): # Module can't be imported, and it's executable. Let's try to # execute it.