提交 6d822091 编写于 作者: L Lukáš Doktor

Merge pull request #954 from lmr/fix-not-fully-pickable-exceptions

[V2] avocado.core.runner: Fix problems with exceptions that can't be pickled
...@@ -52,6 +52,26 @@ class TestStatus(object): ...@@ -52,6 +52,26 @@ class TestStatus(object):
self.status = {} self.status = {}
self.interrupt = None self.interrupt = None
def _get_msg_from_queue(self):
"""
Helper method to handle safely getting messages from the queue.
:return: Message, None if exception happened.
:rtype: dict
"""
try:
return self.queue.get()
# Let's catch all exceptions, since errors here mean a
# crash in avocado.
except Exception, details:
e_msg = ("\nError receiving message from test: %s -> %s" %
(details.__class__, details))
self.job.view.notify(event="error",
msg=e_msg)
stacktrace.log_exc_info(sys.exc_info(),
'avocado.app.tracebacks')
return None
@property @property
def early_status(self): def early_status(self):
""" """
...@@ -62,7 +82,9 @@ class TestStatus(object): ...@@ -62,7 +82,9 @@ class TestStatus(object):
else: else:
queue = [] queue = []
while not self.queue.empty(): while not self.queue.empty():
msg = self.queue.get() msg = self._get_msg_from_queue()
if msg is None:
break
if "early_status" in msg: if "early_status" in msg:
self._early_status = msg self._early_status = msg
for _ in queue: # Return all unprocessed messages back for _ in queue: # Return all unprocessed messages back
...@@ -108,7 +130,9 @@ class TestStatus(object): ...@@ -108,7 +130,9 @@ class TestStatus(object):
Process the queue and update current status Process the queue and update current status
""" """
while not self.queue.empty(): while not self.queue.empty():
msg = self.queue.get() msg = self._get_msg_from_queue()
if msg is None:
break
if "func_at_exit" in msg: if "func_at_exit" in msg:
self.job.funcatexit.register(msg["func_at_exit"], self.job.funcatexit.register(msg["func_at_exit"],
msg.get("args", tuple()), msg.get("args", tuple()),
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册