From 8b97d9320b989023c62db8246f5d8d2126c3723e Mon Sep 17 00:00:00 2001 From: Mariano Lopez Date: Mon, 28 Sep 2015 11:53:18 +0000 Subject: oetest: Change logic of a failed test Currently the logic to check if a test failed was to check for an exception in the thread, but some decorators used in the syslog runtime test would generate and handle exceptions; this will mess with the current check logic and will dump the host and the target as if the test failed. This patch changes the check logic to verify if the test that just happend is in the failure test list and dump the host and target accordingly. [YOCTO #8406] Signed-off-by: Mariano Lopez Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/lib/oeqa/oetest.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'meta') diff --git a/meta/lib/oeqa/oetest.py b/meta/lib/oeqa/oetest.py index a7c7203201..e3bbc46905 100644 --- a/meta/lib/oeqa/oetest.py +++ b/meta/lib/oeqa/oetest.py @@ -16,8 +16,7 @@ try: except ImportError: pass import logging -from oeqa.utils.decorators import LogResults, gettag -from sys import exc_info, exc_clear +from oeqa.utils.decorators import LogResults, gettag, getResults logger = logging.getLogger("BitBake") @@ -184,17 +183,18 @@ class oeRuntimeTest(oeTest): pass def tearDown(self): - # If a test fails or there is an exception - if not exc_info() == (None, None, None): - exc_clear() - #Only dump for QemuTarget - if (type(self.target).__name__ == "QemuTarget"): - self.tc.host_dumper.create_dir(self._testMethodName) - self.tc.host_dumper.dump_host() - self.target.target_dumper.dump_target( - self.tc.host_dumper.dump_dir) - print ("%s dump data stored in %s" % (self._testMethodName, - self.tc.host_dumper.dump_dir)) + res = getResults() + # If a test fails or there is an exception dump + # for QemuTarget only + if (type(self.target).__name__ == "QemuTarget" and + (self.id() in res.getErrorList() or + self.id() in res.getFailList())): + self.tc.host_dumper.create_dir(self._testMethodName) + self.tc.host_dumper.dump_host() + self.target.target_dumper.dump_target( + self.tc.host_dumper.dump_dir) + print ("%s dump data stored in %s" % (self._testMethodName, + self.tc.host_dumper.dump_dir)) #TODO: use package_manager.py to install packages on any type of image def install_packages(self, packagelist): -- cgit v1.2.3