diff options
author | Ross Burton <ross@burtonini.com> | 2022-03-31 19:29:08 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-01 23:11:37 +0100 |
commit | 416cce968d3abb85177287cc1e497867d0472755 (patch) | |
tree | 6e3a5dab815105c9402c22887e6b07c94ca585bc /meta/lib/oeqa/selftest/cases/wic.py | |
parent | 4e5f84902e52d477e46eb83978f23416f09bbc6a (diff) | |
download | poky-416cce968d3abb85177287cc1e497867d0472755.tar.gz |
oeqa/selftest: tag tests that use runqemu
There may be environments or machines which don't have working runqemu,
so tag all of the tests which use runqemu() so that they can be skipped.
(From OE-Core rev: 3f45ce6d2b1dfde8bc3d554397d55f81846c52d5)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/selftest/cases/wic.py')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/wic.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py index 325fb7776a..2eb80ac194 100644 --- a/meta/lib/oeqa/selftest/cases/wic.py +++ b/meta/lib/oeqa/selftest/cases/wic.py | |||
@@ -19,6 +19,7 @@ from functools import wraps, lru_cache | |||
19 | from tempfile import NamedTemporaryFile | 19 | from tempfile import NamedTemporaryFile |
20 | 20 | ||
21 | from oeqa.selftest.case import OESelftestTestCase | 21 | from oeqa.selftest.case import OESelftestTestCase |
22 | from oeqa.core.decorator import OETestTag | ||
22 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars, runqemu | 23 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars, runqemu |
23 | 24 | ||
24 | 25 | ||
@@ -843,6 +844,7 @@ class Wic2(WicTestCase): | |||
843 | 844 | ||
844 | # TODO this should work on aarch64 | 845 | # TODO this should work on aarch64 |
845 | @only_for_arch(['i586', 'i686', 'x86_64']) | 846 | @only_for_arch(['i586', 'i686', 'x86_64']) |
847 | @OETestTag("runqemu") | ||
846 | def test_qemu(self): | 848 | def test_qemu(self): |
847 | """Test wic-image-minimal under qemu""" | 849 | """Test wic-image-minimal under qemu""" |
848 | config = 'IMAGE_FSTYPES += "wic"\nWKS_FILE = "wic-image-minimal"\n'\ | 850 | config = 'IMAGE_FSTYPES += "wic"\nWKS_FILE = "wic-image-minimal"\n'\ |
@@ -863,6 +865,7 @@ class Wic2(WicTestCase): | |||
863 | self.assertEqual(output, 'UUID=2c71ef06-a81d-4735-9d3a-379b69c6bdba\t/media\text4\tdefaults\t0\t0') | 865 | self.assertEqual(output, 'UUID=2c71ef06-a81d-4735-9d3a-379b69c6bdba\t/media\text4\tdefaults\t0\t0') |
864 | 866 | ||
865 | @only_for_arch(['i586', 'i686', 'x86_64']) | 867 | @only_for_arch(['i586', 'i686', 'x86_64']) |
868 | @OETestTag("runqemu") | ||
866 | def test_qemu_efi(self): | 869 | def test_qemu_efi(self): |
867 | """Test core-image-minimal efi image under qemu""" | 870 | """Test core-image-minimal efi image under qemu""" |
868 | config = 'IMAGE_FSTYPES = "wic"\nWKS_FILE = "mkefidisk.wks"\n' | 871 | config = 'IMAGE_FSTYPES = "wic"\nWKS_FILE = "mkefidisk.wks"\n' |
@@ -1046,6 +1049,7 @@ class Wic2(WicTestCase): | |||
1046 | self.assertGreaterEqual(size, 204800) | 1049 | self.assertGreaterEqual(size, 204800) |
1047 | 1050 | ||
1048 | @only_for_arch(['i586', 'i686', 'x86_64', 'aarch64']) | 1051 | @only_for_arch(['i586', 'i686', 'x86_64', 'aarch64']) |
1052 | @OETestTag("runqemu") | ||
1049 | def test_rawcopy_plugin_qemu(self): | 1053 | def test_rawcopy_plugin_qemu(self): |
1050 | """Test rawcopy plugin in qemu""" | 1054 | """Test rawcopy plugin in qemu""" |
1051 | # build ext4 and then use it for a wic image | 1055 | # build ext4 and then use it for a wic image |
@@ -1113,6 +1117,7 @@ class Wic2(WicTestCase): | |||
1113 | self.assertEqual('1', result.output) | 1117 | self.assertEqual('1', result.output) |
1114 | 1118 | ||
1115 | @only_for_arch(['i586', 'i686', 'x86_64']) | 1119 | @only_for_arch(['i586', 'i686', 'x86_64']) |
1120 | @OETestTag("runqemu") | ||
1116 | def test_biosplusefi_plugin_qemu(self): | 1121 | def test_biosplusefi_plugin_qemu(self): |
1117 | """Test biosplusefi plugin in qemu""" | 1122 | """Test biosplusefi plugin in qemu""" |
1118 | config = 'IMAGE_FSTYPES = "wic"\nWKS_FILE = "test_biosplusefi_plugin.wks"\nMACHINE_FEATURES:append = " efi"\n' | 1123 | config = 'IMAGE_FSTYPES = "wic"\nWKS_FILE = "test_biosplusefi_plugin.wks"\nMACHINE_FEATURES:append = " efi"\n' |
@@ -1172,6 +1177,7 @@ class Wic2(WicTestCase): | |||
1172 | 1177 | ||
1173 | # TODO this test could also work on aarch64 | 1178 | # TODO this test could also work on aarch64 |
1174 | @only_for_arch(['i586', 'i686', 'x86_64']) | 1179 | @only_for_arch(['i586', 'i686', 'x86_64']) |
1180 | @OETestTag("runqemu") | ||
1175 | def test_efi_plugin_unified_kernel_image_qemu(self): | 1181 | def test_efi_plugin_unified_kernel_image_qemu(self): |
1176 | """Test efi plugin's Unified Kernel Image feature in qemu""" | 1182 | """Test efi plugin's Unified Kernel Image feature in qemu""" |
1177 | config = 'IMAGE_FSTYPES = "wic"\n'\ | 1183 | config = 'IMAGE_FSTYPES = "wic"\n'\ |
@@ -1381,6 +1387,7 @@ class Wic2(WicTestCase): | |||
1381 | self.assertEqual(1, len(out)) | 1387 | self.assertEqual(1, len(out)) |
1382 | 1388 | ||
1383 | @only_for_arch(['i586', 'i686', 'x86_64']) | 1389 | @only_for_arch(['i586', 'i686', 'x86_64']) |
1390 | @OETestTag("runqemu") | ||
1384 | def test_expand_mbr_image(self): | 1391 | def test_expand_mbr_image(self): |
1385 | """Test wic write --expand command for mbr image""" | 1392 | """Test wic write --expand command for mbr image""" |
1386 | # build an image | 1393 | # build an image |