From 7f9148efb48578f60ac774976c0fb46702879707 Mon Sep 17 00:00:00 2001 From: Renato Alves Date: Tue, 15 Jul 2014 02:40:56 +0100 Subject: [PATCH] Unittest - CommandError exception treats SIGABRT specially * SIGABRT will be used to signal processes that failed to finish after the process assigned time (default 1 second). --- test/basetest/exceptions.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test/basetest/exceptions.py b/test/basetest/exceptions.py index 3bb836711..abfcdb8ae 100644 --- a/test/basetest/exceptions.py +++ b/test/basetest/exceptions.py @@ -1,11 +1,17 @@ # -*- coding: utf-8 -*- +import signal class CommandError(Exception): def __init__(self, cmd, code, out, err, msg=None): if msg is None: - self.msg = ("Command '{0}' finished with unexpected exit code " - "'{1}':\nStdout: '{2}'\nStderr: '{3}'") + if code == signal.SIGABRT: + self.msg = ("Command '{0}' was aborted, likely due to not " + "finishing in due time. The exit code was " + "'{1}':\nStdout: '{2}'\nStderr: '{3}'") + else: + self.msg = ("Command '{0}' finished with unexpected exit code " + "'{1}':\nStdout: '{2}'\nStderr: '{3}'") else: self.msg = msg