From: Martin Jansa Date: Sat, 18 Nov 2023 23:41:25 +0000 (+0100) Subject: oeqa: wic: use just isfile() instead of islink() X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5de40c82a648f4001637b7c5de45fdd4d400ba1;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git oeqa: wic: use just isfile() instead of islink() * with [YOCTO #12937] changes the manifest is hardlink not symlink * fixes: 2023-11-18 23:48:55,695 - oe-selftest - INFO - ... FAIL 2023-11-18 23:48:55,696 - oe-selftest - INFO - Traceback (most recent call last): File "/OE/build/poky/meta/lib/oeqa/core/decorator/__init__.py", line 35, in wrapped_f return func(*args, **kwargs) ^^^^^^^^^^^^^^^^^^^^^ File "/OE/build/poky/meta/lib/oeqa/selftest/cases/wic.py", line 836, in test_wic_image_type self.assertTrue(os.path.islink(path), msg="Link %s wasn't generated as expected" % path) AssertionError: False is not true : Link tmp/deploy/images/qemux86-64/wic-image-minimal-qemux86-64.rootfs--1.0-r0-20110405230000.wic wasn't generated as expected --- diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py index b616759209a..d40fb37ea6b 100644 --- a/meta/lib/oeqa/selftest/cases/wic.py +++ b/meta/lib/oeqa/selftest/cases/wic.py @@ -925,7 +925,7 @@ class Wic2(WicTestCase): # pointing to existing files for suffix in ('wic', 'manifest'): path = prefix + suffix - self.assertTrue(os.path.islink(path), msg="Link %s wasn't generated as expected" % path) + self.assertTrue(os.path.isfile(path), msg="Link %s wasn't generated as expected" % path) self.assertTrue(os.path.isfile(os.path.realpath(path)), msg="File linked to by %s wasn't generated as expected" % path) # TODO this should work on aarch64