mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-13 14:02:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

oeqa/core/utils/concurrencytest.py: Handle exceptions and details

Browse Source 
Handle the streaming of exception content with details data. The
testtools package allows both 'err' and 'details' kwargs but can only
pass one of them to the parent.

To handle the passing of exception traceback and details data at the
same time, encode the traceback into the details object and remove the
'err' arg from the add* result call. This encodes the traceback similar
to how 'err' is handled without any details object. Decoding is already
done by testtools when the traceback is encoded in the details object.

(From OE-Core rev: 3613451825b251784b7673d89db465b9782c3a31)

Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Nathan Rossi
2019-09-27 05:31:08 +00:00
committed by Richard Purdie
parent e25ee9fe28
commit 02a334c98f
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
meta/lib/oeqa/core/utils/concurrencytest.py
View File

@@ -78,29 +78,29 @@ class ProxyTestResult:
def __init__(self, target):
self.result = target
def _addResult(self, method, test, *args, **kwargs):
def _addResult(self, method, test, *args, exception = False, **kwargs):
return method(test, *args, **kwargs)
def addError(self, test, *args, **kwargs):
self._addResult(self.result.addError, test, *args, **kwargs)
def addError(self, test, err = None, **kwargs):
self._addResult(self.result.addError, test, err, exception = True, **kwargs)
def addFailure(self, test, *args, **kwargs):
self._addResult(self.result.addFailure, test, *args, **kwargs)
def addFailure(self, test, err = None, **kwargs):
self._addResult(self.result.addFailure, test, err, exception = True, **kwargs)
def addSuccess(self, test, *args, **kwargs):
self._addResult(self.result.addSuccess, test, *args, **kwargs)
def addSuccess(self, test, **kwargs):
self._addResult(self.result.addSuccess, test, **kwargs)
def addExpectedFailure(self, test, *args, **kwargs):
self._addResult(self.result.addExpectedFailure, test, *args, **kwargs)
def addExpectedFailure(self, test, err = None, **kwargs):
self._addResult(self.result.addExpectedFailure, test, err, exception = True, **kwargs)
def addUnexpectedSuccess(self, test, *args, **kwargs):
self._addResult(self.result.addUnexpectedSuccess, test, *args, **kwargs)
def addUnexpectedSuccess(self, test, **kwargs):
self._addResult(self.result.addUnexpectedSuccess, test, **kwargs)
def __getattr__(self, attr):
return getattr(self.result, attr)
class ExtraResultsDecoderTestResult(ProxyTestResult):
def _addResult(self, method, test, *args, **kwargs):
def _addResult(self, method, test, *args, exception = False, **kwargs):
if "details" in kwargs and "extraresults" in kwargs["details"]:
if isinstance(kwargs["details"]["extraresults"], Content):
kwargs = kwargs.copy()
@@ -114,7 +114,7 @@ class ExtraResultsDecoderTestResult(ProxyTestResult):
return method(test, *args, **kwargs)
class ExtraResultsEncoderTestResult(ProxyTestResult):
def _addResult(self, method, test, *args, **kwargs):
def _addResult(self, method, test, *args, exception = False, **kwargs):
if hasattr(test, "extraresults"):
extras = lambda : [json.dumps(test.extraresults).encode()]
kwargs = kwargs.copy()
@@ -123,6 +123,11 @@ class ExtraResultsEncoderTestResult(ProxyTestResult):
else:
kwargs["details"] = kwargs["details"].copy()
kwargs["details"]["extraresults"] = Content(ContentType("application", "json", {'charset': 'utf8'}), extras)
# if using details, need to encode any exceptions into the details obj,
# testtools does not handle "err" and "details" together.
if "details" in kwargs and exception and (len(args) >= 1 and args[0] is not None):
kwargs["details"]["traceback"] = testtools.content.TracebackContent(args[0], test)
args = []
return method(test, *args, **kwargs)
#