mirror of
https://git.yoctoproject.org/poky
synced 2026-09-16 09:49:35 +02:00
oeqa/concurrencytest: don't delete build directory for failed tests
(From OE-Core rev: be24033acee75526a3a66c12606ef67dcb52a7ee) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 3d5aa170d2e88b852bd2a4452aab9311a24badef) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
5b65a822d6
commit
45c4dbf32e
@@ -77,14 +77,17 @@ class ProxyTestResult:
|
|||||||
# a very basic TestResult proxy, in order to modify add* calls
|
# a very basic TestResult proxy, in order to modify add* calls
|
||||||
def __init__(self, target):
|
def __init__(self, target):
|
||||||
self.result = target
|
self.result = target
|
||||||
|
self.failed_tests = 0
|
||||||
|
|
||||||
def _addResult(self, method, test, *args, exception = False, **kwargs):
|
def _addResult(self, method, test, *args, exception = False, **kwargs):
|
||||||
return method(test, *args, **kwargs)
|
return method(test, *args, **kwargs)
|
||||||
|
|
||||||
def addError(self, test, err = None, **kwargs):
|
def addError(self, test, err = None, **kwargs):
|
||||||
|
self.failed_tests += 1
|
||||||
self._addResult(self.result.addError, test, err, exception = True, **kwargs)
|
self._addResult(self.result.addError, test, err, exception = True, **kwargs)
|
||||||
|
|
||||||
def addFailure(self, test, err = None, **kwargs):
|
def addFailure(self, test, err = None, **kwargs):
|
||||||
|
self.failed_tests += 1
|
||||||
self._addResult(self.result.addFailure, test, err, exception = True, **kwargs)
|
self._addResult(self.result.addFailure, test, err, exception = True, **kwargs)
|
||||||
|
|
||||||
def addSuccess(self, test, **kwargs):
|
def addSuccess(self, test, **kwargs):
|
||||||
@@ -96,6 +99,9 @@ class ProxyTestResult:
|
|||||||
def addUnexpectedSuccess(self, test, **kwargs):
|
def addUnexpectedSuccess(self, test, **kwargs):
|
||||||
self._addResult(self.result.addUnexpectedSuccess, test, **kwargs)
|
self._addResult(self.result.addUnexpectedSuccess, test, **kwargs)
|
||||||
|
|
||||||
|
def wasSuccessful(self):
|
||||||
|
return self.failed_tests == 0
|
||||||
|
|
||||||
def __getattr__(self, attr):
|
def __getattr__(self, attr):
|
||||||
return getattr(self.result, attr)
|
return getattr(self.result, attr)
|
||||||
|
|
||||||
@@ -287,10 +293,10 @@ def fork_for_tests(concurrency_num, suite):
|
|||||||
# as per default in parent code
|
# as per default in parent code
|
||||||
subunit_client.buffer = True
|
subunit_client.buffer = True
|
||||||
subunit_result = AutoTimingTestResultDecorator(subunit_client)
|
subunit_result = AutoTimingTestResultDecorator(subunit_client)
|
||||||
process_suite.run(ExtraResultsEncoderTestResult(subunit_result))
|
unittest_result = process_suite.run(ExtraResultsEncoderTestResult(subunit_result))
|
||||||
if ourpid != os.getpid():
|
if ourpid != os.getpid():
|
||||||
os._exit(0)
|
os._exit(0)
|
||||||
if newbuilddir:
|
if newbuilddir and unittest_result.wasSuccessful():
|
||||||
removebuilddir(newbuilddir)
|
removebuilddir(newbuilddir)
|
||||||
except:
|
except:
|
||||||
# Don't do anything with process children
|
# Don't do anything with process children
|
||||||
|
|||||||
Reference in New Issue
Block a user