diff options
author | Yeoh Ee Peng <ee.peng.yeoh@intel.com> | 2017-05-21 11:22:22 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-25 23:35:50 +0100 |
commit | b0a74554ef926ce05078494ca8e67178b56232f5 (patch) | |
tree | 1f78e7d837d6337050e8b3a3f9d0c5fc1e907b5f | |
parent | a5a14edb5573e33667b63b1e34cb4e19d075e8e8 (diff) | |
download | openembedded-core-b0a74554ef926ce05078494ca8e67178b56232f5.tar.gz openembedded-core-b0a74554ef926ce05078494ca8e67178b56232f5.tar.bz2 openembedded-core-b0a74554ef926ce05078494ca8e67178b56232f5.zip |
base.py: add assertExists and assertNotExists to oeselftest
Current osselftest print confusing assertion message when using
self.assertTrue(os.path.exists(filepath)) to test file path,
example of confusing assertion message:
AssertionError: False is not true
Add the assertExists and assertNotExists to improve assertion
message and simplify coding, using selft.assertExists(filepath),
will print meaningful assertion message:
AssertionError: <filepath> does not exist
[YOCTO #11356]
Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r-- | meta/lib/oeqa/selftest/base.py | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/meta/lib/oeqa/selftest/base.py b/meta/lib/oeqa/selftest/base.py index 47a8ea8271..43a1951be3 100644 --- a/meta/lib/oeqa/selftest/base.py +++ b/meta/lib/oeqa/selftest/base.py @@ -18,6 +18,7 @@ from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_test_layer from oeqa.utils.decorators import LogResults from random import choice import glob +from unittest.util import safe_repr @LogResults class oeSelfTest(unittest.TestCase): @@ -214,6 +215,18 @@ be re-executed from a clean environment to ensure accurate results.") self.log.debug("Writing to: %s\n%s\n" % (self.machineinc_path, data)) ftools.write_file(self.machineinc_path, data) + # check does path exist + def assertExists(self, expr, msg=None): + if not os.path.exists(expr): + msg = self._formatMessage(msg, "%s does not exist" % safe_repr(expr)) + raise self.failureException(msg) + + # check does path not exist + def assertNotExists(self, expr, msg=None): + if os.path.exists(expr): + msg = self._formatMessage(msg, "%s exists when it should not" % safe_repr(expr)) + raise self.failureException(msg) + def get_available_machines(): # Get a list of all available machines |