[prev in list] [next in list] [prev in thread] [next in thread]
List: openembedded-commits
Subject: [oe-commits] Corneliu Stoicescu : oe-selftest: Fix for test_rm_old_image
From: git () git ! openembedded ! org (git at git ! openembedded ! org)
Date: 2014-02-28 17:56:32
Message-ID: 20140228175632.C397B5044D () opal
[Download RAW message or body]
Module: openembedded-core.git
Branch: master-next
Commit: 45709d1eae28fc567c5dca9a48393d56d28f785d
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=45709d1eae28fc567c5dca9a48393d56d28f785d
Author: Corneliu Stoicescu <corneliux.stoicescu at intel.com>
Date: Thu Feb 27 15:53:16 2014 +0200
oe-selftest: Fix for test_rm_old_image
After recent changes in poky this test was not working as it should.
This commit fixes and improves the test logic.
Signed-off-by: Corneliu Stoicescu <corneliux.stoicescu at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
meta/lib/oeqa/selftest/buildoptions.py | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/meta/lib/oeqa/selftest/buildoptions.py \
b/meta/lib/oeqa/selftest/buildoptions.py index ef6579b..93b02cf 100644
--- a/meta/lib/oeqa/selftest/buildoptions.py
+++ b/meta/lib/oeqa/selftest/buildoptions.py
@@ -26,10 +26,16 @@ class ImageOptionsTests(oeSelfTest):
bitbake("core-image-minimal")
deploydir = get_bb_var("DEPLOY_DIR_IMAGE", target="core-image-minimal")
imagename = get_bb_var("IMAGE_LINK_NAME", target="core-image-minimal")
- oldimgpath = os.path.realpath(os.path.join(deploydir, imagename + ".ext3"))
+ deploydir_files = os.listdir(deploydir)
+ track_original_files = []
+ for image_file in deploydir_files:
+ if imagename in image_file and os.path.islink(os.path.join(deploydir, \
image_file)): + \
track_original_files.append(os.path.realpath(os.path.join(deploydir, image_file))) \
self.append_config("RM_OLD_IMAGE = \"1\"")
- bitbake("core-image-minimal")
- self.assertFalse(os.path.exists(oldimgpath), msg="Old image path still \
exists: %s" % oldimgpath) + bitbake("-C rootfs core-image-minimal")
+ deploydir_files = os.listdir(deploydir)
+ remaining_not_expected = [path for path in track_original_files if \
os.path.basename(path) in deploydir_files] + \
self.assertFalse(remaining_not_expected, msg="\nThe following image files ware not \
removed: %s" % ', '.join(map(str, remaining_not_expected)))
def test_ccache_tool(self):
bitbake("ccache-native")
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic