diff options
| author |   Ross Burton <ross@burtonini.com> | 2022-03-31 19:28:56 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-01 23:05:31 +0100 |
| commit | 450e09b6d4ca019848aec4c62fce280a09395b97 (patch) | |
| tree | 1d19d95a9e2db4b77f1c65dc7080f913c23e9261 | |
| parent | b4d8aca97a1ead38ce55f3bb5859d3d05d9dd84f (diff) | |
| download | openembedded-core-contrib-450e09b6d4ca019848aec4c62fce280a09395b97.tar.gz | |
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 <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/wic.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py index 6f3dc27743..673942fc9c 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'""" |