diff options
Diffstat (limited to 'meta/lib/oeqa/selftest/cases/wic.py')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/wic.py | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py index 79925f942f..f22781d15c 100644 --- a/meta/lib/oeqa/selftest/cases/wic.py +++ b/meta/lib/oeqa/selftest/cases/wic.py | |||
@@ -34,7 +34,6 @@ from tempfile import NamedTemporaryFile | |||
34 | 34 | ||
35 | from oeqa.selftest.case import OESelftestTestCase | 35 | from oeqa.selftest.case import OESelftestTestCase |
36 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars, runqemu | 36 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars, runqemu |
37 | from oeqa.core.decorator.oeid import OETestID | ||
38 | 37 | ||
39 | 38 | ||
40 | @lru_cache(maxsize=32) | 39 | @lru_cache(maxsize=32) |
@@ -103,63 +102,51 @@ class WicTestCase(OESelftestTestCase): | |||
103 | 102 | ||
104 | class Wic(WicTestCase): | 103 | class Wic(WicTestCase): |
105 | 104 | ||
106 | @OETestID(1552) | ||
107 | def test_version(self): | 105 | def test_version(self): |
108 | """Test wic --version""" | 106 | """Test wic --version""" |
109 | runCmd('wic --version') | 107 | runCmd('wic --version') |
110 | 108 | ||
111 | @OETestID(1208) | ||
112 | def test_help(self): | 109 | def test_help(self): |
113 | """Test wic --help and wic -h""" | 110 | """Test wic --help and wic -h""" |
114 | runCmd('wic --help') | 111 | runCmd('wic --help') |
115 | runCmd('wic -h') | 112 | runCmd('wic -h') |
116 | 113 | ||
117 | @OETestID(1209) | ||
118 | def test_createhelp(self): | 114 | def test_createhelp(self): |
119 | """Test wic create --help""" | 115 | """Test wic create --help""" |
120 | runCmd('wic create --help') | 116 | runCmd('wic create --help') |
121 | 117 | ||
122 | @OETestID(1210) | ||
123 | def test_listhelp(self): | 118 | def test_listhelp(self): |
124 | """Test wic list --help""" | 119 | """Test wic list --help""" |
125 | runCmd('wic list --help') | 120 | runCmd('wic list --help') |
126 | 121 | ||
127 | @OETestID(1553) | ||
128 | def test_help_create(self): | 122 | def test_help_create(self): |
129 | """Test wic help create""" | 123 | """Test wic help create""" |
130 | runCmd('wic help create') | 124 | runCmd('wic help create') |
131 | 125 | ||
132 | @OETestID(1554) | ||
133 | def test_help_list(self): | 126 | def test_help_list(self): |
134 | """Test wic help list""" | 127 | """Test wic help list""" |
135 | runCmd('wic help list') | 128 | runCmd('wic help list') |
136 | 129 | ||
137 | @OETestID(1215) | ||
138 | def test_help_overview(self): | 130 | def test_help_overview(self): |
139 | """Test wic help overview""" | 131 | """Test wic help overview""" |
140 | runCmd('wic help overview') | 132 | runCmd('wic help overview') |
141 | 133 | ||
142 | @OETestID(1216) | ||
143 | def test_help_plugins(self): | 134 | def test_help_plugins(self): |
144 | """Test wic help plugins""" | 135 | """Test wic help plugins""" |
145 | runCmd('wic help plugins') | 136 | runCmd('wic help plugins') |
146 | 137 | ||
147 | @OETestID(1217) | ||
148 | def test_help_kickstart(self): | 138 | def test_help_kickstart(self): |
149 | """Test wic help kickstart""" | 139 | """Test wic help kickstart""" |
150 | runCmd('wic help kickstart') | 140 | runCmd('wic help kickstart') |
151 | 141 | ||
152 | @OETestID(1555) | ||
153 | def test_list_images(self): | 142 | def test_list_images(self): |
154 | """Test wic list images""" | 143 | """Test wic list images""" |
155 | runCmd('wic list images') | 144 | runCmd('wic list images') |
156 | 145 | ||
157 | @OETestID(1556) | ||
158 | def test_list_source_plugins(self): | 146 | def test_list_source_plugins(self): |
159 | """Test wic list source-plugins""" | 147 | """Test wic list source-plugins""" |
160 | runCmd('wic list source-plugins') | 148 | runCmd('wic list source-plugins') |
161 | 149 | ||
162 | @OETestID(1557) | ||
163 | def test_listed_images_help(self): | 150 | def test_listed_images_help(self): |
164 | """Test wic listed images help""" | 151 | """Test wic listed images help""" |
165 | output = runCmd('wic list images').output | 152 | output = runCmd('wic list images').output |
@@ -167,24 +154,20 @@ class Wic(WicTestCase): | |||
167 | for image in imagelist: | 154 | for image in imagelist: |
168 | runCmd('wic list %s help' % image) | 155 | runCmd('wic list %s help' % image) |
169 | 156 | ||
170 | @OETestID(1213) | ||
171 | def test_unsupported_subcommand(self): | 157 | def test_unsupported_subcommand(self): |
172 | """Test unsupported subcommand""" | 158 | """Test unsupported subcommand""" |
173 | self.assertNotEqual(0, runCmd('wic unsupported', ignore_status=True).status) | 159 | self.assertNotEqual(0, runCmd('wic unsupported', ignore_status=True).status) |
174 | 160 | ||
175 | @OETestID(1214) | ||
176 | def test_no_command(self): | 161 | def test_no_command(self): |
177 | """Test wic without command""" | 162 | """Test wic without command""" |
178 | self.assertEqual(1, runCmd('wic', ignore_status=True).status) | 163 | self.assertEqual(1, runCmd('wic', ignore_status=True).status) |
179 | 164 | ||
180 | @OETestID(1211) | ||
181 | def test_build_image_name(self): | 165 | def test_build_image_name(self): |
182 | """Test wic create wictestdisk --image-name=core-image-minimal""" | 166 | """Test wic create wictestdisk --image-name=core-image-minimal""" |
183 | cmd = "wic create wictestdisk --image-name=core-image-minimal -o %s" % self.resultdir | 167 | cmd = "wic create wictestdisk --image-name=core-image-minimal -o %s" % self.resultdir |
184 | runCmd(cmd) | 168 | runCmd(cmd) |
185 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct"))) | 169 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct"))) |
186 | 170 | ||
187 | @OETestID(1157) | ||
188 | @only_for_arch(['i586', 'i686', 'x86_64']) | 171 | @only_for_arch(['i586', 'i686', 'x86_64']) |
189 | def test_gpt_image(self): | 172 | def test_gpt_image(self): |
190 | """Test creation of core-image-minimal with gpt table and UUID boot""" | 173 | """Test creation of core-image-minimal with gpt table and UUID boot""" |
@@ -192,7 +175,6 @@ class Wic(WicTestCase): | |||
192 | runCmd(cmd) | 175 | runCmd(cmd) |
193 | self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct"))) | 176 | self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct"))) |
194 | 177 | ||
195 | @OETestID(1346) | ||
196 | @only_for_arch(['i586', 'i686', 'x86_64']) | 178 | @only_for_arch(['i586', 'i686', 'x86_64']) |
197 | def test_iso_image(self): | 179 | def test_iso_image(self): |
198 | """Test creation of hybrid iso image with legacy and EFI boot""" | 180 | """Test creation of hybrid iso image with legacy and EFI boot""" |
@@ -207,7 +189,6 @@ class Wic(WicTestCase): | |||
207 | self.assertEqual(1, len(glob(self.resultdir + "HYBRID_ISO_IMG-*.direct"))) | 189 | self.assertEqual(1, len(glob(self.resultdir + "HYBRID_ISO_IMG-*.direct"))) |
208 | self.assertEqual(1, len(glob(self.resultdir + "HYBRID_ISO_IMG-*.iso"))) | 190 | self.assertEqual(1, len(glob(self.resultdir + "HYBRID_ISO_IMG-*.iso"))) |
209 | 191 | ||
210 | @OETestID(1348) | ||
211 | @only_for_arch(['i586', 'i686', 'x86_64']) | 192 | @only_for_arch(['i586', 'i686', 'x86_64']) |
212 | def test_qemux86_directdisk(self): | 193 | def test_qemux86_directdisk(self): |
213 | """Test creation of qemux-86-directdisk image""" | 194 | """Test creation of qemux-86-directdisk image""" |
@@ -215,7 +196,6 @@ class Wic(WicTestCase): | |||
215 | runCmd(cmd) | 196 | runCmd(cmd) |
216 | self.assertEqual(1, len(glob(self.resultdir + "qemux86-directdisk-*direct"))) | 197 | self.assertEqual(1, len(glob(self.resultdir + "qemux86-directdisk-*direct"))) |
217 | 198 | ||
218 | @OETestID(1350) | ||
219 | @only_for_arch(['i586', 'i686', 'x86_64']) | 199 | @only_for_arch(['i586', 'i686', 'x86_64']) |
220 | def test_mkefidisk(self): | 200 | def test_mkefidisk(self): |
221 | """Test creation of mkefidisk image""" | 201 | """Test creation of mkefidisk image""" |
@@ -223,7 +203,6 @@ class Wic(WicTestCase): | |||
223 | runCmd(cmd) | 203 | runCmd(cmd) |
224 | self.assertEqual(1, len(glob(self.resultdir + "mkefidisk-*direct"))) | 204 | self.assertEqual(1, len(glob(self.resultdir + "mkefidisk-*direct"))) |
225 | 205 | ||
226 | @OETestID(1385) | ||
227 | @only_for_arch(['i586', 'i686', 'x86_64']) | 206 | @only_for_arch(['i586', 'i686', 'x86_64']) |
228 | def test_bootloader_config(self): | 207 | def test_bootloader_config(self): |
229 | """Test creation of directdisk-bootloader-config image""" | 208 | """Test creation of directdisk-bootloader-config image""" |
@@ -235,7 +214,6 @@ class Wic(WicTestCase): | |||
235 | runCmd(cmd) | 214 | runCmd(cmd) |
236 | self.assertEqual(1, len(glob(self.resultdir + "directdisk-bootloader-config-*direct"))) | 215 | self.assertEqual(1, len(glob(self.resultdir + "directdisk-bootloader-config-*direct"))) |
237 | 216 | ||
238 | @OETestID(1560) | ||
239 | @only_for_arch(['i586', 'i686', 'x86_64']) | 217 | @only_for_arch(['i586', 'i686', 'x86_64']) |
240 | def test_systemd_bootdisk(self): | 218 | def test_systemd_bootdisk(self): |
241 | """Test creation of systemd-bootdisk image""" | 219 | """Test creation of systemd-bootdisk image""" |
@@ -247,7 +225,6 @@ class Wic(WicTestCase): | |||
247 | runCmd(cmd) | 225 | runCmd(cmd) |
248 | self.assertEqual(1, len(glob(self.resultdir + "systemd-bootdisk-*direct"))) | 226 | self.assertEqual(1, len(glob(self.resultdir + "systemd-bootdisk-*direct"))) |
249 | 227 | ||
250 | @OETestID(1561) | ||
251 | def test_sdimage_bootpart(self): | 228 | def test_sdimage_bootpart(self): |
252 | """Test creation of sdimage-bootpart image""" | 229 | """Test creation of sdimage-bootpart image""" |
253 | cmd = "wic create sdimage-bootpart -e core-image-minimal -o %s" % self.resultdir | 230 | cmd = "wic create sdimage-bootpart -e core-image-minimal -o %s" % self.resultdir |
@@ -256,7 +233,6 @@ class Wic(WicTestCase): | |||
256 | runCmd(cmd) | 233 | runCmd(cmd) |
257 | self.assertEqual(1, len(glob(self.resultdir + "sdimage-bootpart-*direct"))) | 234 | self.assertEqual(1, len(glob(self.resultdir + "sdimage-bootpart-*direct"))) |
258 | 235 | ||
259 | @OETestID(1562) | ||
260 | @only_for_arch(['i586', 'i686', 'x86_64']) | 236 | @only_for_arch(['i586', 'i686', 'x86_64']) |
261 | def test_default_output_dir(self): | 237 | def test_default_output_dir(self): |
262 | """Test default output location""" | 238 | """Test default output location""" |
@@ -270,7 +246,6 @@ class Wic(WicTestCase): | |||
270 | runCmd(cmd) | 246 | runCmd(cmd) |
271 | self.assertEqual(1, len(glob("directdisk-*.direct"))) | 247 | self.assertEqual(1, len(glob("directdisk-*.direct"))) |
272 | 248 | ||
273 | @OETestID(1212) | ||
274 | @only_for_arch(['i586', 'i686', 'x86_64']) | 249 | @only_for_arch(['i586', 'i686', 'x86_64']) |
275 | def test_build_artifacts(self): | 250 | def test_build_artifacts(self): |
276 | """Test wic create directdisk providing all artifacts.""" | 251 | """Test wic create directdisk providing all artifacts.""" |
@@ -288,7 +263,6 @@ class Wic(WicTestCase): | |||
288 | "-o %(resultdir)s" % bbvars) | 263 | "-o %(resultdir)s" % bbvars) |
289 | self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct"))) | 264 | self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct"))) |
290 | 265 | ||
291 | @OETestID(1264) | ||
292 | def test_compress_gzip(self): | 266 | def test_compress_gzip(self): |
293 | """Test compressing an image with gzip""" | 267 | """Test compressing an image with gzip""" |
294 | runCmd("wic create wictestdisk " | 268 | runCmd("wic create wictestdisk " |
@@ -296,7 +270,6 @@ class Wic(WicTestCase): | |||
296 | "-c gzip -o %s" % self.resultdir) | 270 | "-c gzip -o %s" % self.resultdir) |
297 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct.gz"))) | 271 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct.gz"))) |
298 | 272 | ||
299 | @OETestID(1265) | ||
300 | def test_compress_bzip2(self): | 273 | def test_compress_bzip2(self): |
301 | """Test compressing an image with bzip2""" | 274 | """Test compressing an image with bzip2""" |
302 | runCmd("wic create wictestdisk " | 275 | runCmd("wic create wictestdisk " |
@@ -304,7 +277,6 @@ class Wic(WicTestCase): | |||
304 | "-c bzip2 -o %s" % self.resultdir) | 277 | "-c bzip2 -o %s" % self.resultdir) |
305 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct.bz2"))) | 278 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct.bz2"))) |
306 | 279 | ||
307 | @OETestID(1266) | ||
308 | def test_compress_xz(self): | 280 | def test_compress_xz(self): |
309 | """Test compressing an image with xz""" | 281 | """Test compressing an image with xz""" |
310 | runCmd("wic create wictestdisk " | 282 | runCmd("wic create wictestdisk " |
@@ -312,7 +284,6 @@ class Wic(WicTestCase): | |||
312 | "--compress-with=xz -o %s" % self.resultdir) | 284 | "--compress-with=xz -o %s" % self.resultdir) |
313 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct.xz"))) | 285 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct.xz"))) |
314 | 286 | ||
315 | @OETestID(1267) | ||
316 | def test_wrong_compressor(self): | 287 | def test_wrong_compressor(self): |
317 | """Test how wic breaks if wrong compressor is provided""" | 288 | """Test how wic breaks if wrong compressor is provided""" |
318 | self.assertEqual(2, runCmd("wic create wictestdisk " | 289 | self.assertEqual(2, runCmd("wic create wictestdisk " |
@@ -320,7 +291,6 @@ class Wic(WicTestCase): | |||
320 | "-c wrong -o %s" % self.resultdir, | 291 | "-c wrong -o %s" % self.resultdir, |
321 | ignore_status=True).status) | 292 | ignore_status=True).status) |
322 | 293 | ||
323 | @OETestID(1558) | ||
324 | def test_debug_short(self): | 294 | def test_debug_short(self): |
325 | """Test -D option""" | 295 | """Test -D option""" |
326 | runCmd("wic create wictestdisk " | 296 | runCmd("wic create wictestdisk " |
@@ -328,7 +298,6 @@ class Wic(WicTestCase): | |||
328 | "-D -o %s" % self.resultdir) | 298 | "-D -o %s" % self.resultdir) |
329 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct"))) | 299 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct"))) |
330 | 300 | ||
331 | @OETestID(1658) | ||
332 | def test_debug_long(self): | 301 | def test_debug_long(self): |
333 | """Test --debug option""" | 302 | """Test --debug option""" |
334 | runCmd("wic create wictestdisk " | 303 | runCmd("wic create wictestdisk " |
@@ -336,7 +305,6 @@ class Wic(WicTestCase): | |||
336 | "--debug -o %s" % self.resultdir) | 305 | "--debug -o %s" % self.resultdir) |
337 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct"))) | 306 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct"))) |
338 | 307 | ||
339 | @OETestID(1563) | ||
340 | def test_skip_build_check_short(self): | 308 | def test_skip_build_check_short(self): |
341 | """Test -s option""" | 309 | """Test -s option""" |
342 | runCmd("wic create wictestdisk " | 310 | runCmd("wic create wictestdisk " |
@@ -344,7 +312,6 @@ class Wic(WicTestCase): | |||
344 | "-s -o %s" % self.resultdir) | 312 | "-s -o %s" % self.resultdir) |
345 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct"))) | 313 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct"))) |
346 | 314 | ||
347 | @OETestID(1671) | ||
348 | def test_skip_build_check_long(self): | 315 | def test_skip_build_check_long(self): |
349 | """Test --skip-build-check option""" | 316 | """Test --skip-build-check option""" |
350 | runCmd("wic create wictestdisk " | 317 | runCmd("wic create wictestdisk " |
@@ -353,7 +320,6 @@ class Wic(WicTestCase): | |||
353 | "--outdir %s" % self.resultdir) | 320 | "--outdir %s" % self.resultdir) |
354 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct"))) | 321 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct"))) |
355 | 322 | ||
356 | @OETestID(1564) | ||
357 | def test_build_rootfs_short(self): | 323 | def test_build_rootfs_short(self): |
358 | """Test -f option""" | 324 | """Test -f option""" |
359 | runCmd("wic create wictestdisk " | 325 | runCmd("wic create wictestdisk " |
@@ -361,7 +327,6 @@ class Wic(WicTestCase): | |||
361 | "-f -o %s" % self.resultdir) | 327 | "-f -o %s" % self.resultdir) |
362 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct"))) | 328 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct"))) |
363 | 329 | ||
364 | @OETestID(1656) | ||
365 | def test_build_rootfs_long(self): | 330 | def test_build_rootfs_long(self): |
366 | """Test --build-rootfs option""" | 331 | """Test --build-rootfs option""" |
367 | runCmd("wic create wictestdisk " | 332 | runCmd("wic create wictestdisk " |
@@ -370,7 +335,6 @@ class Wic(WicTestCase): | |||
370 | "--outdir %s" % self.resultdir) | 335 | "--outdir %s" % self.resultdir) |
371 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct"))) | 336 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct"))) |
372 | 337 | ||
373 | @OETestID(1268) | ||
374 | @only_for_arch(['i586', 'i686', 'x86_64']) | 338 | @only_for_arch(['i586', 'i686', 'x86_64']) |
375 | def test_rootfs_indirect_recipes(self): | 339 | def test_rootfs_indirect_recipes(self): |
376 | """Test usage of rootfs plugin with rootfs recipes""" | 340 | """Test usage of rootfs plugin with rootfs recipes""" |
@@ -381,7 +345,6 @@ class Wic(WicTestCase): | |||
381 | "--outdir %s" % self.resultdir) | 345 | "--outdir %s" % self.resultdir) |
382 | self.assertEqual(1, len(glob(self.resultdir + "directdisk-multi-rootfs*.direct"))) | 346 | self.assertEqual(1, len(glob(self.resultdir + "directdisk-multi-rootfs*.direct"))) |
383 | 347 | ||
384 | @OETestID(1269) | ||
385 | @only_for_arch(['i586', 'i686', 'x86_64']) | 348 | @only_for_arch(['i586', 'i686', 'x86_64']) |
386 | def test_rootfs_artifacts(self): | 349 | def test_rootfs_artifacts(self): |
387 | """Test usage of rootfs plugin with rootfs paths""" | 350 | """Test usage of rootfs plugin with rootfs paths""" |
@@ -401,7 +364,6 @@ class Wic(WicTestCase): | |||
401 | "--outdir %(resultdir)s" % bbvars) | 364 | "--outdir %(resultdir)s" % bbvars) |
402 | self.assertEqual(1, len(glob(self.resultdir + "%(wks)s-*.direct" % bbvars))) | 365 | self.assertEqual(1, len(glob(self.resultdir + "%(wks)s-*.direct" % bbvars))) |
403 | 366 | ||
404 | @OETestID(1661) | ||
405 | def test_exclude_path(self): | 367 | def test_exclude_path(self): |
406 | """Test --exclude-path wks option.""" | 368 | """Test --exclude-path wks option.""" |
407 | 369 | ||
@@ -504,7 +466,6 @@ part /etc --source rootfs --ondisk mmcblk0 --fstype=ext4 --exclude-path bin/ --r | |||
504 | finally: | 466 | finally: |
505 | os.environ['PATH'] = oldpath | 467 | os.environ['PATH'] = oldpath |
506 | 468 | ||
507 | @OETestID(1662) | ||
508 | def test_exclude_path_errors(self): | 469 | def test_exclude_path_errors(self): |
509 | """Test --exclude-path wks option error handling.""" | 470 | """Test --exclude-path wks option error handling.""" |
510 | wks_file = 'temp.wks' | 471 | wks_file = 'temp.wks' |
@@ -525,7 +486,6 @@ part /etc --source rootfs --ondisk mmcblk0 --fstype=ext4 --exclude-path bin/ --r | |||
525 | 486 | ||
526 | class Wic2(WicTestCase): | 487 | class Wic2(WicTestCase): |
527 | 488 | ||
528 | @OETestID(1496) | ||
529 | def test_bmap_short(self): | 489 | def test_bmap_short(self): |
530 | """Test generation of .bmap file -m option""" | 490 | """Test generation of .bmap file -m option""" |
531 | cmd = "wic create wictestdisk -e core-image-minimal -m -o %s" % self.resultdir | 491 | cmd = "wic create wictestdisk -e core-image-minimal -m -o %s" % self.resultdir |
@@ -533,7 +493,6 @@ class Wic2(WicTestCase): | |||
533 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*direct"))) | 493 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*direct"))) |
534 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*direct.bmap"))) | 494 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*direct.bmap"))) |
535 | 495 | ||
536 | @OETestID(1655) | ||
537 | def test_bmap_long(self): | 496 | def test_bmap_long(self): |
538 | """Test generation of .bmap file --bmap option""" | 497 | """Test generation of .bmap file --bmap option""" |
539 | cmd = "wic create wictestdisk -e core-image-minimal --bmap -o %s" % self.resultdir | 498 | cmd = "wic create wictestdisk -e core-image-minimal --bmap -o %s" % self.resultdir |
@@ -541,7 +500,6 @@ class Wic2(WicTestCase): | |||
541 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*direct"))) | 500 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*direct"))) |
542 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*direct.bmap"))) | 501 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*direct.bmap"))) |
543 | 502 | ||
544 | @OETestID(1347) | ||
545 | def test_image_env(self): | 503 | def test_image_env(self): |
546 | """Test generation of <image>.env files.""" | 504 | """Test generation of <image>.env files.""" |
547 | image = 'core-image-minimal' | 505 | image = 'core-image-minimal' |
@@ -564,7 +522,6 @@ class Wic2(WicTestCase): | |||
564 | self.assertTrue(var in content, "%s is not in .env file" % var) | 522 | self.assertTrue(var in content, "%s is not in .env file" % var) |
565 | self.assertTrue(content[var]) | 523 | self.assertTrue(content[var]) |
566 | 524 | ||
567 | @OETestID(1559) | ||
568 | def test_image_vars_dir_short(self): | 525 | def test_image_vars_dir_short(self): |
569 | """Test image vars directory selection -v option""" | 526 | """Test image vars directory selection -v option""" |
570 | image = 'core-image-minimal' | 527 | image = 'core-image-minimal' |
@@ -577,7 +534,6 @@ class Wic2(WicTestCase): | |||
577 | self.resultdir)) | 534 | self.resultdir)) |
578 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*direct"))) | 535 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*direct"))) |
579 | 536 | ||
580 | @OETestID(1665) | ||
581 | def test_image_vars_dir_long(self): | 537 | def test_image_vars_dir_long(self): |
582 | """Test image vars directory selection --vars option""" | 538 | """Test image vars directory selection --vars option""" |
583 | image = 'core-image-minimal' | 539 | image = 'core-image-minimal' |
@@ -593,7 +549,6 @@ class Wic2(WicTestCase): | |||
593 | self.resultdir)) | 549 | self.resultdir)) |
594 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*direct"))) | 550 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*direct"))) |
595 | 551 | ||
596 | @OETestID(1351) | ||
597 | @only_for_arch(['i586', 'i686', 'x86_64']) | 552 | @only_for_arch(['i586', 'i686', 'x86_64']) |
598 | def test_wic_image_type(self): | 553 | def test_wic_image_type(self): |
599 | """Test building wic images by bitbake""" | 554 | """Test building wic images by bitbake""" |
@@ -614,7 +569,6 @@ class Wic2(WicTestCase): | |||
614 | self.assertTrue(os.path.islink(path)) | 569 | self.assertTrue(os.path.islink(path)) |
615 | self.assertTrue(os.path.isfile(os.path.realpath(path))) | 570 | self.assertTrue(os.path.isfile(os.path.realpath(path))) |
616 | 571 | ||
617 | @OETestID(1424) | ||
618 | @only_for_arch(['i586', 'i686', 'x86_64']) | 572 | @only_for_arch(['i586', 'i686', 'x86_64']) |
619 | def test_qemu(self): | 573 | def test_qemu(self): |
620 | """Test wic-image-minimal under qemu""" | 574 | """Test wic-image-minimal under qemu""" |
@@ -636,7 +590,6 @@ class Wic2(WicTestCase): | |||
636 | self.assertEqual(output, 'UUID=2c71ef06-a81d-4735-9d3a-379b69c6bdba\t/media\text4\tdefaults\t0\t0') | 590 | self.assertEqual(output, 'UUID=2c71ef06-a81d-4735-9d3a-379b69c6bdba\t/media\text4\tdefaults\t0\t0') |
637 | 591 | ||
638 | @only_for_arch(['i586', 'i686', 'x86_64']) | 592 | @only_for_arch(['i586', 'i686', 'x86_64']) |
639 | @OETestID(1852) | ||
640 | def test_qemu_efi(self): | 593 | def test_qemu_efi(self): |
641 | """Test core-image-minimal efi image under qemu""" | 594 | """Test core-image-minimal efi image under qemu""" |
642 | config = 'IMAGE_FSTYPES = "wic"\nWKS_FILE = "mkefidisk.wks"\n' | 595 | config = 'IMAGE_FSTYPES = "wic"\nWKS_FILE = "mkefidisk.wks"\n' |
@@ -666,7 +619,6 @@ class Wic2(WicTestCase): | |||
666 | 619 | ||
667 | return wkspath, wksname | 620 | return wkspath, wksname |
668 | 621 | ||
669 | @OETestID(1847) | ||
670 | def test_fixed_size(self): | 622 | def test_fixed_size(self): |
671 | """ | 623 | """ |
672 | Test creation of a simple image with partition size controlled through | 624 | Test creation of a simple image with partition size controlled through |
@@ -697,7 +649,6 @@ class Wic2(WicTestCase): | |||
697 | self.assertEqual(1, len(partlns)) | 649 | self.assertEqual(1, len(partlns)) |
698 | self.assertEqual("1:0.00MiB:200MiB:200MiB:ext4::;", partlns[0]) | 650 | self.assertEqual("1:0.00MiB:200MiB:200MiB:ext4::;", partlns[0]) |
699 | 651 | ||
700 | @OETestID(1848) | ||
701 | def test_fixed_size_error(self): | 652 | def test_fixed_size_error(self): |
702 | """ | 653 | """ |
703 | Test creation of a simple image with partition size controlled through | 654 | Test creation of a simple image with partition size controlled through |
@@ -713,7 +664,6 @@ class Wic2(WicTestCase): | |||
713 | self.assertEqual(0, len(wicout)) | 664 | self.assertEqual(0, len(wicout)) |
714 | 665 | ||
715 | @only_for_arch(['i586', 'i686', 'x86_64']) | 666 | @only_for_arch(['i586', 'i686', 'x86_64']) |
716 | @OETestID(1854) | ||
717 | def test_rawcopy_plugin_qemu(self): | 667 | def test_rawcopy_plugin_qemu(self): |
718 | """Test rawcopy plugin in qemu""" | 668 | """Test rawcopy plugin in qemu""" |
719 | # build ext4 and wic images | 669 | # build ext4 and wic images |
@@ -729,7 +679,6 @@ class Wic2(WicTestCase): | |||
729 | self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output)) | 679 | self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output)) |
730 | self.assertEqual(output, '2') | 680 | self.assertEqual(output, '2') |
731 | 681 | ||
732 | @OETestID(1853) | ||
733 | def test_rawcopy_plugin(self): | 682 | def test_rawcopy_plugin(self): |
734 | """Test rawcopy plugin""" | 683 | """Test rawcopy plugin""" |
735 | img = 'core-image-minimal' | 684 | img = 'core-image-minimal' |
@@ -746,7 +695,6 @@ class Wic2(WicTestCase): | |||
746 | out = glob(self.resultdir + "%s-*direct" % wksname) | 695 | out = glob(self.resultdir + "%s-*direct" % wksname) |
747 | self.assertEqual(1, len(out)) | 696 | self.assertEqual(1, len(out)) |
748 | 697 | ||
749 | @OETestID(1849) | ||
750 | def test_fs_types(self): | 698 | def test_fs_types(self): |
751 | """Test filesystem types for empty and not empty partitions""" | 699 | """Test filesystem types for empty and not empty partitions""" |
752 | img = 'core-image-minimal' | 700 | img = 'core-image-minimal' |
@@ -766,7 +714,6 @@ class Wic2(WicTestCase): | |||
766 | out = glob(self.resultdir + "%s-*direct" % wksname) | 714 | out = glob(self.resultdir + "%s-*direct" % wksname) |
767 | self.assertEqual(1, len(out)) | 715 | self.assertEqual(1, len(out)) |
768 | 716 | ||
769 | @OETestID(1851) | ||
770 | def test_kickstart_parser(self): | 717 | def test_kickstart_parser(self): |
771 | """Test wks parser options""" | 718 | """Test wks parser options""" |
772 | with NamedTemporaryFile("w", suffix=".wks") as wks: | 719 | with NamedTemporaryFile("w", suffix=".wks") as wks: |
@@ -779,7 +726,6 @@ class Wic2(WicTestCase): | |||
779 | out = glob(self.resultdir + "%s-*direct" % wksname) | 726 | out = glob(self.resultdir + "%s-*direct" % wksname) |
780 | self.assertEqual(1, len(out)) | 727 | self.assertEqual(1, len(out)) |
781 | 728 | ||
782 | @OETestID(1850) | ||
783 | def test_image_bootpart_globbed(self): | 729 | def test_image_bootpart_globbed(self): |
784 | """Test globbed sources with image-bootpart plugin""" | 730 | """Test globbed sources with image-bootpart plugin""" |
785 | img = "core-image-minimal" | 731 | img = "core-image-minimal" |
@@ -790,7 +736,6 @@ class Wic2(WicTestCase): | |||
790 | self.remove_config(config) | 736 | self.remove_config(config) |
791 | self.assertEqual(1, len(glob(self.resultdir + "sdimage-bootpart-*direct"))) | 737 | self.assertEqual(1, len(glob(self.resultdir + "sdimage-bootpart-*direct"))) |
792 | 738 | ||
793 | @OETestID(1855) | ||
794 | def test_sparse_copy(self): | 739 | def test_sparse_copy(self): |
795 | """Test sparse_copy with FIEMAP and SEEK_HOLE filemap APIs""" | 740 | """Test sparse_copy with FIEMAP and SEEK_HOLE filemap APIs""" |
796 | libpath = os.path.join(get_bb_var('COREBASE'), 'scripts', 'lib', 'wic') | 741 | libpath = os.path.join(get_bb_var('COREBASE'), 'scripts', 'lib', 'wic') |
@@ -819,7 +764,6 @@ class Wic2(WicTestCase): | |||
819 | self.assertEqual(dest_stat.st_blocks, 8) | 764 | self.assertEqual(dest_stat.st_blocks, 8) |
820 | os.unlink(dest) | 765 | os.unlink(dest) |
821 | 766 | ||
822 | @OETestID(1857) | ||
823 | def test_wic_ls(self): | 767 | def test_wic_ls(self): |
824 | """Test listing image content using 'wic ls'""" | 768 | """Test listing image content using 'wic ls'""" |
825 | runCmd("wic create wictestdisk " | 769 | runCmd("wic create wictestdisk " |
@@ -838,7 +782,6 @@ class Wic2(WicTestCase): | |||
838 | result = runCmd("wic ls %s:1/ -n %s" % (images[0], sysroot)) | 782 | result = runCmd("wic ls %s:1/ -n %s" % (images[0], sysroot)) |
839 | self.assertEqual(6, len(result.output.split('\n'))) | 783 | self.assertEqual(6, len(result.output.split('\n'))) |
840 | 784 | ||
841 | @OETestID(1856) | ||
842 | def test_wic_cp(self): | 785 | def test_wic_cp(self): |
843 | """Test copy files and directories to the the wic image.""" | 786 | """Test copy files and directories to the the wic image.""" |
844 | runCmd("wic create wictestdisk " | 787 | runCmd("wic create wictestdisk " |
@@ -878,7 +821,6 @@ class Wic2(WicTestCase): | |||
878 | self.assertEqual(8, len(result.output.split('\n'))) | 821 | self.assertEqual(8, len(result.output.split('\n'))) |
879 | self.assertTrue(os.path.basename(testdir) in result.output) | 822 | self.assertTrue(os.path.basename(testdir) in result.output) |
880 | 823 | ||
881 | @OETestID(1858) | ||
882 | def test_wic_rm(self): | 824 | def test_wic_rm(self): |
883 | """Test removing files and directories from the the wic image.""" | 825 | """Test removing files and directories from the the wic image.""" |
884 | runCmd("wic create mkefidisk " | 826 | runCmd("wic create mkefidisk " |
@@ -905,7 +847,6 @@ class Wic2(WicTestCase): | |||
905 | self.assertNotIn('\nBZIMAGE ', result.output) | 847 | self.assertNotIn('\nBZIMAGE ', result.output) |
906 | self.assertNotIn('\nEFI <DIR> ', result.output) | 848 | self.assertNotIn('\nEFI <DIR> ', result.output) |
907 | 849 | ||
908 | @OETestID(1922) | ||
909 | def test_mkfs_extraopts(self): | 850 | def test_mkfs_extraopts(self): |
910 | """Test wks option --mkfs-extraopts for empty and not empty partitions""" | 851 | """Test wks option --mkfs-extraopts for empty and not empty partitions""" |
911 | img = 'core-image-minimal' | 852 | img = 'core-image-minimal' |