diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-08 16:56:32 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-09 16:31:55 +0100 |
commit | c7592b01478def091b6787412390c61e7ce0a0cd (patch) | |
tree | 3c2f26480c6e16fae0ad65b032e3dc0fccfca71b /meta/lib/oeqa/selftest/cases/runqemu.py | |
parent | c0dc72bad92e2e4dc0aedb48b969709f821baf73 (diff) | |
download | poky-c7592b01478def091b6787412390c61e7ce0a0cd.tar.gz |
oeqa: Drop OETestID
These IDs refer to testopia which we're no longer using. We would now use the test
names to definitively reference tests and the IDs can be dropped, along with their
supporting code.
(From OE-Core rev: 8e2d0575e4e7036b5f60e632f377a8ab2b96ead8)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/selftest/cases/runqemu.py')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/runqemu.py | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/meta/lib/oeqa/selftest/cases/runqemu.py b/meta/lib/oeqa/selftest/cases/runqemu.py index f69d4706a5..3598104aeb 100644 --- a/meta/lib/oeqa/selftest/cases/runqemu.py +++ b/meta/lib/oeqa/selftest/cases/runqemu.py | |||
@@ -8,7 +8,6 @@ import time | |||
8 | import oe.types | 8 | import oe.types |
9 | from oeqa.selftest.case import OESelftestTestCase | 9 | from oeqa.selftest.case import OESelftestTestCase |
10 | from oeqa.utils.commands import bitbake, runqemu, get_bb_var, runCmd | 10 | from oeqa.utils.commands import bitbake, runqemu, get_bb_var, runCmd |
11 | from oeqa.core.decorator.oeid import OETestID | ||
12 | 11 | ||
13 | class RunqemuTests(OESelftestTestCase): | 12 | class RunqemuTests(OESelftestTestCase): |
14 | """Runqemu test class""" | 13 | """Runqemu test class""" |
@@ -42,7 +41,6 @@ SYSLINUX_TIMEOUT = "10" | |||
42 | bitbake(self.recipe) | 41 | bitbake(self.recipe) |
43 | RunqemuTests.image_is_ready = True | 42 | RunqemuTests.image_is_ready = True |
44 | 43 | ||
45 | @OETestID(2001) | ||
46 | def test_boot_machine(self): | 44 | def test_boot_machine(self): |
47 | """Test runqemu machine""" | 45 | """Test runqemu machine""" |
48 | cmd = "%s %s" % (self.cmd_common, self.machine) | 46 | cmd = "%s %s" % (self.cmd_common, self.machine) |
@@ -50,7 +48,6 @@ SYSLINUX_TIMEOUT = "10" | |||
50 | with open(qemu.qemurunnerlog) as f: | 48 | with open(qemu.qemurunnerlog) as f: |
51 | self.assertTrue(qemu.runner.logged, "Failed: %s, %s" % (cmd, f.read())) | 49 | self.assertTrue(qemu.runner.logged, "Failed: %s, %s" % (cmd, f.read())) |
52 | 50 | ||
53 | @OETestID(2002) | ||
54 | def test_boot_machine_ext4(self): | 51 | def test_boot_machine_ext4(self): |
55 | """Test runqemu machine ext4""" | 52 | """Test runqemu machine ext4""" |
56 | cmd = "%s %s ext4" % (self.cmd_common, self.machine) | 53 | cmd = "%s %s ext4" % (self.cmd_common, self.machine) |
@@ -58,7 +55,6 @@ SYSLINUX_TIMEOUT = "10" | |||
58 | with open(qemu.qemurunnerlog) as f: | 55 | with open(qemu.qemurunnerlog) as f: |
59 | self.assertIn('rootfs.ext4', f.read(), "Failed: %s" % cmd) | 56 | self.assertIn('rootfs.ext4', f.read(), "Failed: %s" % cmd) |
60 | 57 | ||
61 | @OETestID(2003) | ||
62 | def test_boot_machine_iso(self): | 58 | def test_boot_machine_iso(self): |
63 | """Test runqemu machine iso""" | 59 | """Test runqemu machine iso""" |
64 | cmd = "%s %s iso" % (self.cmd_common, self.machine) | 60 | cmd = "%s %s iso" % (self.cmd_common, self.machine) |
@@ -66,7 +62,6 @@ SYSLINUX_TIMEOUT = "10" | |||
66 | with open(qemu.qemurunnerlog) as f: | 62 | with open(qemu.qemurunnerlog) as f: |
67 | self.assertIn('media=cdrom', f.read(), "Failed: %s" % cmd) | 63 | self.assertIn('media=cdrom', f.read(), "Failed: %s" % cmd) |
68 | 64 | ||
69 | @OETestID(2004) | ||
70 | def test_boot_recipe_image(self): | 65 | def test_boot_recipe_image(self): |
71 | """Test runqemu recipe-image""" | 66 | """Test runqemu recipe-image""" |
72 | cmd = "%s %s" % (self.cmd_common, self.recipe) | 67 | cmd = "%s %s" % (self.cmd_common, self.recipe) |
@@ -75,7 +70,6 @@ SYSLINUX_TIMEOUT = "10" | |||
75 | self.assertTrue(qemu.runner.logged, "Failed: %s, %s" % (cmd, f.read())) | 70 | self.assertTrue(qemu.runner.logged, "Failed: %s, %s" % (cmd, f.read())) |
76 | 71 | ||
77 | 72 | ||
78 | @OETestID(2005) | ||
79 | def test_boot_recipe_image_vmdk(self): | 73 | def test_boot_recipe_image_vmdk(self): |
80 | """Test runqemu recipe-image vmdk""" | 74 | """Test runqemu recipe-image vmdk""" |
81 | cmd = "%s %s wic.vmdk" % (self.cmd_common, self.recipe) | 75 | cmd = "%s %s wic.vmdk" % (self.cmd_common, self.recipe) |
@@ -83,7 +77,6 @@ SYSLINUX_TIMEOUT = "10" | |||
83 | with open(qemu.qemurunnerlog) as f: | 77 | with open(qemu.qemurunnerlog) as f: |
84 | self.assertIn('format=vmdk', f.read(), "Failed: %s" % cmd) | 78 | self.assertIn('format=vmdk', f.read(), "Failed: %s" % cmd) |
85 | 79 | ||
86 | @OETestID(2006) | ||
87 | def test_boot_recipe_image_vdi(self): | 80 | def test_boot_recipe_image_vdi(self): |
88 | """Test runqemu recipe-image vdi""" | 81 | """Test runqemu recipe-image vdi""" |
89 | cmd = "%s %s wic.vdi" % (self.cmd_common, self.recipe) | 82 | cmd = "%s %s wic.vdi" % (self.cmd_common, self.recipe) |
@@ -91,7 +84,6 @@ SYSLINUX_TIMEOUT = "10" | |||
91 | with open(qemu.qemurunnerlog) as f: | 84 | with open(qemu.qemurunnerlog) as f: |
92 | self.assertIn('format=vdi', f.read(), "Failed: %s" % cmd) | 85 | self.assertIn('format=vdi', f.read(), "Failed: %s" % cmd) |
93 | 86 | ||
94 | @OETestID(2007) | ||
95 | def test_boot_deploy(self): | 87 | def test_boot_deploy(self): |
96 | """Test runqemu deploy_dir_image""" | 88 | """Test runqemu deploy_dir_image""" |
97 | cmd = "%s %s" % (self.cmd_common, self.deploy_dir_image) | 89 | cmd = "%s %s" % (self.cmd_common, self.deploy_dir_image) |
@@ -100,7 +92,6 @@ SYSLINUX_TIMEOUT = "10" | |||
100 | self.assertTrue(qemu.runner.logged, "Failed: %s, %s" % (cmd, f.read())) | 92 | self.assertTrue(qemu.runner.logged, "Failed: %s, %s" % (cmd, f.read())) |
101 | 93 | ||
102 | 94 | ||
103 | @OETestID(2008) | ||
104 | def test_boot_deploy_hddimg(self): | 95 | def test_boot_deploy_hddimg(self): |
105 | """Test runqemu deploy_dir_image hddimg""" | 96 | """Test runqemu deploy_dir_image hddimg""" |
106 | cmd = "%s %s hddimg" % (self.cmd_common, self.deploy_dir_image) | 97 | cmd = "%s %s hddimg" % (self.cmd_common, self.deploy_dir_image) |
@@ -108,7 +99,6 @@ SYSLINUX_TIMEOUT = "10" | |||
108 | with open(qemu.qemurunnerlog) as f: | 99 | with open(qemu.qemurunnerlog) as f: |
109 | self.assertTrue(re.search('file=.*.hddimg', f.read()), "Failed: %s, %s" % (cmd, f.read())) | 100 | self.assertTrue(re.search('file=.*.hddimg', f.read()), "Failed: %s, %s" % (cmd, f.read())) |
110 | 101 | ||
111 | @OETestID(2009) | ||
112 | def test_boot_machine_slirp(self): | 102 | def test_boot_machine_slirp(self): |
113 | """Test runqemu machine slirp""" | 103 | """Test runqemu machine slirp""" |
114 | cmd = "%s slirp %s" % (self.cmd_common, self.machine) | 104 | cmd = "%s slirp %s" % (self.cmd_common, self.machine) |
@@ -116,7 +106,6 @@ SYSLINUX_TIMEOUT = "10" | |||
116 | with open(qemu.qemurunnerlog) as f: | 106 | with open(qemu.qemurunnerlog) as f: |
117 | self.assertIn(' -netdev user', f.read(), "Failed: %s" % cmd) | 107 | self.assertIn(' -netdev user', f.read(), "Failed: %s" % cmd) |
118 | 108 | ||
119 | @OETestID(2009) | ||
120 | def test_boot_machine_slirp_qcow2(self): | 109 | def test_boot_machine_slirp_qcow2(self): |
121 | """Test runqemu machine slirp qcow2""" | 110 | """Test runqemu machine slirp qcow2""" |
122 | cmd = "%s slirp wic.qcow2 %s" % (self.cmd_common, self.machine) | 111 | cmd = "%s slirp wic.qcow2 %s" % (self.cmd_common, self.machine) |
@@ -124,7 +113,6 @@ SYSLINUX_TIMEOUT = "10" | |||
124 | with open(qemu.qemurunnerlog) as f: | 113 | with open(qemu.qemurunnerlog) as f: |
125 | self.assertIn('format=qcow2', f.read(), "Failed: %s" % cmd) | 114 | self.assertIn('format=qcow2', f.read(), "Failed: %s" % cmd) |
126 | 115 | ||
127 | @OETestID(2010) | ||
128 | def test_boot_qemu_boot(self): | 116 | def test_boot_qemu_boot(self): |
129 | """Test runqemu /path/to/image.qemuboot.conf""" | 117 | """Test runqemu /path/to/image.qemuboot.conf""" |
130 | qemuboot_conf = "%s-%s.qemuboot.conf" % (self.recipe, self.machine) | 118 | qemuboot_conf = "%s-%s.qemuboot.conf" % (self.recipe, self.machine) |
@@ -136,7 +124,6 @@ SYSLINUX_TIMEOUT = "10" | |||
136 | with open(qemu.qemurunnerlog) as f: | 124 | with open(qemu.qemurunnerlog) as f: |
137 | self.assertTrue(qemu.runner.logged, "Failed: %s, %s" % (cmd, f.read())) | 125 | self.assertTrue(qemu.runner.logged, "Failed: %s, %s" % (cmd, f.read())) |
138 | 126 | ||
139 | @OETestID(2011) | ||
140 | def test_boot_rootfs(self): | 127 | def test_boot_rootfs(self): |
141 | """Test runqemu /path/to/rootfs.ext4""" | 128 | """Test runqemu /path/to/rootfs.ext4""" |
142 | rootfs = "%s-%s.ext4" % (self.recipe, self.machine) | 129 | rootfs = "%s-%s.ext4" % (self.recipe, self.machine) |