From 450e09b6d4ca019848aec4c62fce280a09395b97 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 31 Mar 2022 19:28:56 +0100 Subject: [PATCH] oeqa/selftest/wic: use os.rename instead of bb.utils.rename bb.utils.rename() only exists to handle moves across filesystems. As these moves are within the same directory we can just use os.rename(). Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni --- meta/lib/oeqa/selftest/cases/wic.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py index 6f3dc277439..673942fc9cc 100644 --- a/meta/lib/oeqa/selftest/cases/wic.py +++ b/meta/lib/oeqa/selftest/cases/wic.py @@ -1416,8 +1416,8 @@ class Wic2(WicTestCase): result = runCmd("%s/usr/sbin/sfdisk -F %s" % (sysroot, new_image_path)) self.assertTrue("0 B, 0 bytes, 0 sectors" in result.output) - bb.utils.rename(image_path, image_path + '.bak') - bb.utils.rename(new_image_path, image_path) + os.rename(image_path, image_path + '.bak') + os.rename(new_image_path, image_path) # Check if it boots in qemu with runqemu('core-image-minimal', ssh=False, runqemuparams='nographic') as qemu: @@ -1428,7 +1428,8 @@ class Wic2(WicTestCase): if os.path.exists(new_image_path): os.unlink(new_image_path) if os.path.exists(image_path + '.bak'): - bb.utils.rename(image_path + '.bak', image_path) + os.rename(image_path + '.bak', image_path) + def test_wic_ls_ext(self): """Test listing content of the ext partition using 'wic ls'""" -- 2.47.2