manifest.py: Add tests to empty image
PATCH 1/1 manifest.py: Add tests to empty image
An oe-selftest test is added to ensure meta-selftest/recipes-test/images/test-empty-image.bb builds and is empty.
It is just a test that ensures that an empty image has no packages in it (i.e. nothing in the manifest)
See [YOCTO #8455] for details.
--- meta/lib/oeqa/selftest/cases/manifest.py | 45 ++++++++++++++++++++++++ 1 file changed, 45 insertions(+)
meta/lib/oeqa/selftest/cases/manifest.py +45 -0
@@ -162,3 +162,48 @@ class VerifyManifest(OESelftestTestCase): self.logger.debug(logmsg) self.logger.info(msg) self.fail(logmsg) + +class VerifyEmptyManifest(OESelftestTestCase): + '''Tests for the manifest files of an empty image''' + + @classmethod + def setUpClass(self): + + # the setup should bitbake test-empty-image + super(VerifyEmptyManifest, self).setUpClass() + self.buildtarget = 'test-empty-image' + self.classname = 'VerifyEmptyManifest' + + self.logger.info("{}: doing bitbake {} as a prerequisite of the test"\ + .format(self.classname, self.buildtarget)) + if bitbake(self.buildtarget).status: + self.logger.debug("{} Failed to setup {}"\ + .format(self.classname, self.buildtarget)) + self.skipTest("{}: Cannot setup testing scenario"\ + .format(self.classname)) + + + @classmethod + def test_image_manifest_empty(self): + '''Verifying the image manifest file is empty, this may take a build''' + + # get manifest location based on target to query about + try: + mdir = VerifyManifest.get_dir_from_bb_var('DEPLOY_DIR_IMAGE', + self.buildtarget) + mfilename = get_bb_var("IMAGE_LINK_NAME", self.buildtarget)\ + + ".manifest" + mpath = os.path.join(mdir, mfilename) + self.logger.info("Manifest file path is: {}" .format(mpath)) + + if not os.path.isfile(mpath): raise IOError + if not os.path.getsize(mpath) == 0: raise OSError + + except OSError: + raise self.skipTest("{}: manifest file is not empty"\ + .format(self.classname)) + + except IOError: + msg = "{}: Error cannot find manifests in dir:\n{}"\ + .format(self.classname, mdir) + self.fail(msg)
Signature · 1 line
2.25.1
Hi All,
This is a Gentle reminder to review this patch.
Thanks & Regards,
Milan Shah
Quoted 73 lines · Milan Shah
An oe-selftest test is added to ensure meta-selftest/recipes-test/images/test-empty-image.bb builds and is empty.
It is just a test that ensures that an empty image has no packages in it (i.e. nothing in the manifest)
See [YOCTO #8455] for details.
Signed-off-by Milan Shah <[email protected]>--- meta/lib/oeqa/selftest/cases/manifest.py | 45 ++++++++++++++++++++++++ 1 file changed, 45 insertions(+)meta/lib/oeqa/selftest/cases/manifest.py +13
-0@@ -162,3 +162,48 @@ class VerifyManifest(OESelftestTestCase): self.logger.debug(logmsg) self.logger.info(msg) self.fail(logmsg) + +class VerifyEmptyManifest(OESelftestTestCase): + '''Tests for the manifest files of an empty image''' + + @classmethod + def setUpClass(self): + + # the setup should bitbake test-empty-image + super(VerifyEmptyManifest, self).setUpClass() + self.buildtarget = 'test-empty-image' + self.classname = 'VerifyEmptyManifest' + + self.logger.info("{}: doing bitbake {} as a prerequisite of thetest"\
meta/lib/oeqa/selftest/cases/manifest.py +11
-0+ .format(self.classname, self.buildtarget)) + if bitbake(self.buildtarget).status: + self.logger.debug("{} Failed to setup {}"\ + .format(self.classname, self.buildtarget)) + self.skipTest("{}: Cannot setup testing scenario"\ + .format(self.classname)) + + + @classmethod + def test_image_manifest_empty(self): + '''Verifying the image manifest file is empty, this may take abuild'''
meta/lib/oeqa/selftest/cases/manifest.py +21
-1+ + # get manifest location based on target to query about + try: + mdir = VerifyManifest.get_dir_from_bb_var('DEPLOY_DIR_IMAGE', + self.buildtarget) + mfilename = get_bb_var("IMAGE_LINK_NAME", self.buildtarget)\ + + ".manifest" + mpath = os.path.join(mdir, mfilename) + self.logger.info("Manifest file path is: {}" .format(mpath)) + + if not os.path.isfile(mpath): raise IOError + if not os.path.getsize(mpath) == 0: raise OSError + + except OSError: + raise self.skipTest("{}: manifest file is not empty"\ + .format(self.classname)) + + except IOError: + msg = "{}: Error cannot find manifests in dir:\n{}"\ + .format(self.classname, mdir) + self.fail(msg) --2.25.1
Quoted 6 lines · Milan Shah
An oe-selftest test is added to ensure meta-selftest/recipes-test/images/test-empty-image.bb builds and is empty.
It is just a test that ensures that an empty image has no packages in it (i.e. nothing in the manifest)
Quoted 6 lines
See [YOCTO #8455] for details.
Signed-off-by Milan Shah <[email protected]>---
meta/lib/oeqa/selftest/cases/manifest.py | 45 ++++++++++++++++++++++++1 file changed, 45 insertions(+)
I was curious what else was using test-empty-image.bb and I see a test in:
meta/lib/oeqa/selftest/cases/imagefeatures.py:
"""Test creation of image with no packages""" bitbake('test-empty-image')
res_dir = get_bb_var('DEPLOY_DIR_IMAGE')
images = os.path.join(res_dir, "test-empty-image-*.manifest") result = glob.glob(images)
with open(result[1],"r") as f:
self.assertEqual(len(f.read().strip()),0)
Is this test doing the same thing?
Cheers,
Richard
Yes, Richard
Looks like now there are two patches for the same bug. As the bugz was not updated, I also worked on the same bug.
As It is already merged, you can neglect my one. Please update the Bugzilla bug and mark it as resolve whoever has worked on it.
Thanks,
Milan Shah
Quoted 35 lines · Richard Purdie
Quoted 2 lines · Milan Shah
An oe-selftest test is added to ensure meta-selftest/recipes-test/images/test-empty-image.bb builds and is
empty.
Quoted 10 lines
It is just a test that ensures that an empty image has no packages in it (i.e. nothing in the manifest)
See [YOCTO #8455] for details.
Signed-off-by Milan Shah <[email protected]>--- meta/lib/oeqa/selftest/cases/manifest.py | 45 ++++++++++++++++++++++++ 1 file changed, 45 insertions(+)I was curious what else was using test-empty-image.bb and I see a test in:
meta/lib/oeqa/selftest/cases/imagefeatures.py:"""Test creation of image with no packages""" bitbake('test-empty-image')
res_dir=get_bb_var('DEPLOY_DIR_IMAGE')
images =os.path.join(res_dir, "test-empty-image-*.manifest")result =glob.glob(images)
withopen(result[1],"r")as f:
self.assertEqual(len(f.read().strip()),0)Is this test doing the same thing?
Cheers,
Richard
Quoted 6 lines · Milan Shah
Yes, Richard
Looks like now there are two patches for the same bug. As the bugz was not updated, I also worked on the same bug.As It is already merged, you can neglect my one. Please update the Bugzilla bug and mark it as resolve whoever has worked on it.
Sorry about that, we try and keep things in sync but its hard to catch every change. I'll make sure this one is resolved.
Cheers,
Richard