Add a new method that can be used by the tester to add a command to the
executed in the tearDown stage of the test. This mechanism can be used to
make sure certain test-specific cleanup tasks are done in the case of a
test failure.
Signed-off-by: Corneliu Stoicescu <corneliux.stoice...@intel.com>
---
meta/lib/oeqa/selftest/base.py | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/selftest/base.py b/meta/lib/oeqa/selftest/base.py
index c3474a3..25ca84b 100644
--- a/meta/lib/oeqa/selftest/base.py
+++ b/meta/lib/oeqa/selftest/base.py
@@ -13,7 +13,7 @@ import logging
import errno
import oeqa.utils.ftools as ftools
-
+from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_test_layer
class oeSelfTest(unittest.TestCase):
@@ -25,6 +25,7 @@ class oeSelfTest(unittest.TestCase):
self.localconf_path = os.path.join(self.builddir, "conf/local.conf")
self.testinc_path = os.path.join(self.builddir, "conf/selftest.inc")
self.testlayer_path = oeSelfTest.testlayer_path
+ self._extra_tear_down_commands = []
super(oeSelfTest, self).__init__(methodName)
def setUp(self):
@@ -49,11 +50,26 @@ class oeSelfTest(unittest.TestCase):
pass
def tearDown(self):
+ if self._extra_tear_down_commands:
+ failed_extra_commands = []
+ for command in self._extra_tear_down_commands:
+ result = runCmd(command, ignore_status=True)
+ if not result.status == 0:
+ failed_extra_commands.append(command)
+ if failed_extra_commands:
+ self.log.warning("tearDown commands have failed: %s" % ',
'.join(map(str, failed_extra_commands)))
+ self.log.debug("Trying to move on.")
+ self._extra_tear_down_commands = []
self.tearDownLocal()
def tearDownLocal(self):
pass
+ # add test specific commands to the tearDown method.
+ def add_command_to_tearDown(self, command):
+ self.log.debug("Adding command '%s' to tearDown for this test." %
command)
+ self._extra_tear_down_commands.append(command)
+
# write to <builddir>/conf/selftest.inc
def write_config(self, data):
self.log.debug("Writing to: %s\n%s\n" % (self.testinc_path, data))
--
1.7.9.5
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
