diff options
author | Ross Burton <ross@burtonini.com> | 2022-03-31 19:29:13 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-01 23:11:38 +0100 |
commit | 12a1456b060a970a1b2157ef64abe0751d6804b9 (patch) | |
tree | d97bcaaab8ca44ddd43db5f566a99d63d9de53f6 /meta/lib/oeqa/selftest/cases/wic.py | |
parent | ada2cbb6829013edd3846e0fe361a236fcfce373 (diff) | |
download | poky-12a1456b060a970a1b2157ef64abe0751d6804b9.tar.gz |
oeqa/selftest/wic: use os.path.join to join paths
Instead of using string concatenation, use os.path.join.
(From OE-Core rev: 73d1b7163792ec089ffb3bf99f1b4f8760beaea7)
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 | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py index c2496486bc..5bdd9ae87e 100644 --- a/meta/lib/oeqa/selftest/cases/wic.py +++ b/meta/lib/oeqa/selftest/cases/wic.py | |||
@@ -170,14 +170,14 @@ class Wic(WicTestCase): | |||
170 | """Test wic create wictestdisk --image-name=core-image-minimal""" | 170 | """Test wic create wictestdisk --image-name=core-image-minimal""" |
171 | cmd = "wic create wictestdisk --image-name=core-image-minimal -o %s" % self.resultdir | 171 | cmd = "wic create wictestdisk --image-name=core-image-minimal -o %s" % self.resultdir |
172 | runCmd(cmd) | 172 | runCmd(cmd) |
173 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct"))) | 173 | self.assertEqual(1, len(glob(os.path.join (self.resultdir, "wictestdisk-*.direct")))) |
174 | 174 | ||
175 | @only_for_arch(['i586', 'i686', 'x86_64']) | 175 | @only_for_arch(['i586', 'i686', 'x86_64']) |
176 | def test_gpt_image(self): | 176 | def test_gpt_image(self): |
177 | """Test creation of core-image-minimal with gpt table and UUID boot""" | 177 | """Test creation of core-image-minimal with gpt table and UUID boot""" |
178 | cmd = "wic create directdisk-gpt --image-name core-image-minimal -o %s" % self.resultdir | 178 | cmd = "wic create directdisk-gpt --image-name core-image-minimal -o %s" % self.resultdir |
179 | runCmd(cmd) | 179 | runCmd(cmd) |
180 | self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct"))) | 180 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "directdisk-*.direct")))) |
181 | 181 | ||
182 | @only_for_arch(['i586', 'i686', 'x86_64']) | 182 | @only_for_arch(['i586', 'i686', 'x86_64']) |
183 | def test_iso_image(self): | 183 | def test_iso_image(self): |
@@ -190,22 +190,22 @@ class Wic(WicTestCase): | |||
190 | self.remove_config(config) | 190 | self.remove_config(config) |
191 | cmd = "wic create mkhybridiso --image-name core-image-minimal -o %s" % self.resultdir | 191 | cmd = "wic create mkhybridiso --image-name core-image-minimal -o %s" % self.resultdir |
192 | runCmd(cmd) | 192 | runCmd(cmd) |
193 | self.assertEqual(1, len(glob(self.resultdir + "HYBRID_ISO_IMG-*.direct"))) | 193 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "HYBRID_ISO_IMG-*.direct")))) |
194 | self.assertEqual(1, len(glob(self.resultdir + "HYBRID_ISO_IMG-*.iso"))) | 194 | self.assertEqual(1, len(glob(os.path.join (self.resultdir, "HYBRID_ISO_IMG-*.iso")))) |
195 | 195 | ||
196 | @only_for_arch(['i586', 'i686', 'x86_64']) | 196 | @only_for_arch(['i586', 'i686', 'x86_64']) |
197 | def test_qemux86_directdisk(self): | 197 | def test_qemux86_directdisk(self): |
198 | """Test creation of qemux-86-directdisk image""" | 198 | """Test creation of qemux-86-directdisk image""" |
199 | cmd = "wic create qemux86-directdisk -e core-image-minimal -o %s" % self.resultdir | 199 | cmd = "wic create qemux86-directdisk -e core-image-minimal -o %s" % self.resultdir |
200 | runCmd(cmd) | 200 | runCmd(cmd) |
201 | self.assertEqual(1, len(glob(self.resultdir + "qemux86-directdisk-*direct"))) | 201 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "qemux86-directdisk-*direct")))) |
202 | 202 | ||
203 | @only_for_arch(['i586', 'i686', 'x86_64', 'aarch64']) | 203 | @only_for_arch(['i586', 'i686', 'x86_64', 'aarch64']) |
204 | def test_mkefidisk(self): | 204 | def test_mkefidisk(self): |
205 | """Test creation of mkefidisk image""" | 205 | """Test creation of mkefidisk image""" |
206 | cmd = "wic create mkefidisk -e core-image-minimal -o %s" % self.resultdir | 206 | cmd = "wic create mkefidisk -e core-image-minimal -o %s" % self.resultdir |
207 | runCmd(cmd) | 207 | runCmd(cmd) |
208 | self.assertEqual(1, len(glob(self.resultdir + "mkefidisk-*direct"))) | 208 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "mkefidisk-*direct")))) |
209 | 209 | ||
210 | @only_for_arch(['i586', 'i686', 'x86_64']) | 210 | @only_for_arch(['i586', 'i686', 'x86_64']) |
211 | def test_bootloader_config(self): | 211 | def test_bootloader_config(self): |
@@ -216,7 +216,7 @@ class Wic(WicTestCase): | |||
216 | self.remove_config(config) | 216 | self.remove_config(config) |
217 | cmd = "wic create directdisk-bootloader-config -e core-image-minimal -o %s" % self.resultdir | 217 | cmd = "wic create directdisk-bootloader-config -e core-image-minimal -o %s" % self.resultdir |
218 | runCmd(cmd) | 218 | runCmd(cmd) |
219 | self.assertEqual(1, len(glob(self.resultdir + "directdisk-bootloader-config-*direct"))) | 219 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "directdisk-bootloader-config-*direct")))) |
220 | 220 | ||
221 | @only_for_arch(['i586', 'i686', 'x86_64', 'aarch64']) | 221 | @only_for_arch(['i586', 'i686', 'x86_64', 'aarch64']) |
222 | def test_systemd_bootdisk(self): | 222 | def test_systemd_bootdisk(self): |
@@ -227,7 +227,7 @@ class Wic(WicTestCase): | |||
227 | self.remove_config(config) | 227 | self.remove_config(config) |
228 | cmd = "wic create systemd-bootdisk -e core-image-minimal -o %s" % self.resultdir | 228 | cmd = "wic create systemd-bootdisk -e core-image-minimal -o %s" % self.resultdir |
229 | runCmd(cmd) | 229 | runCmd(cmd) |
230 | self.assertEqual(1, len(glob(self.resultdir + "systemd-bootdisk-*direct"))) | 230 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "systemd-bootdisk-*direct")))) |
231 | 231 | ||
232 | def test_efi_bootpart(self): | 232 | def test_efi_bootpart(self): |
233 | """Test creation of efi-bootpart image""" | 233 | """Test creation of efi-bootpart image""" |
@@ -236,7 +236,7 @@ class Wic(WicTestCase): | |||
236 | self.append_config('IMAGE_EFI_BOOT_FILES = "%s;kernel"\n' % kimgtype) | 236 | self.append_config('IMAGE_EFI_BOOT_FILES = "%s;kernel"\n' % kimgtype) |
237 | runCmd(cmd) | 237 | runCmd(cmd) |
238 | sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools') | 238 | sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools') |
239 | images = glob(self.resultdir + "mkefidisk-*.direct") | 239 | images = glob(os.path.join(self.resultdir, "mkefidisk-*.direct")) |
240 | result = runCmd("wic ls %s:1/ -n %s" % (images[0], sysroot)) | 240 | result = runCmd("wic ls %s:1/ -n %s" % (images[0], sysroot)) |
241 | self.assertIn("kernel",result.output) | 241 | self.assertIn("kernel",result.output) |
242 | 242 | ||
@@ -246,7 +246,7 @@ class Wic(WicTestCase): | |||
246 | kimgtype = get_bb_var('KERNEL_IMAGETYPE', 'core-image-minimal') | 246 | kimgtype = get_bb_var('KERNEL_IMAGETYPE', 'core-image-minimal') |
247 | self.write_config('IMAGE_BOOT_FILES = "%s"\n' % kimgtype) | 247 | self.write_config('IMAGE_BOOT_FILES = "%s"\n' % kimgtype) |
248 | runCmd(cmd) | 248 | runCmd(cmd) |
249 | self.assertEqual(1, len(glob(self.resultdir + "sdimage-bootpart-*direct"))) | 249 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "sdimage-bootpart-*direct")))) |
250 | 250 | ||
251 | # TODO this doesn't have to be x86-specific | 251 | # TODO this doesn't have to be x86-specific |
252 | @only_for_arch(['i586', 'i686', 'x86_64']) | 252 | @only_for_arch(['i586', 'i686', 'x86_64']) |
@@ -277,28 +277,28 @@ class Wic(WicTestCase): | |||
277 | "-n %(recipe_sysroot_native)s " | 277 | "-n %(recipe_sysroot_native)s " |
278 | "-r %(image_rootfs)s " | 278 | "-r %(image_rootfs)s " |
279 | "-o %(resultdir)s" % bbvars) | 279 | "-o %(resultdir)s" % bbvars) |
280 | self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct"))) | 280 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "directdisk-*.direct")))) |
281 | 281 | ||
282 | def test_compress_gzip(self): | 282 | def test_compress_gzip(self): |
283 | """Test compressing an image with gzip""" | 283 | """Test compressing an image with gzip""" |
284 | runCmd("wic create wictestdisk " | 284 | runCmd("wic create wictestdisk " |
285 | "--image-name core-image-minimal " | 285 | "--image-name core-image-minimal " |
286 | "-c gzip -o %s" % self.resultdir) | 286 | "-c gzip -o %s" % self.resultdir) |
287 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct.gz"))) | 287 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "wictestdisk-*.direct.gz")))) |
288 | 288 | ||
289 | def test_compress_bzip2(self): | 289 | def test_compress_bzip2(self): |
290 | """Test compressing an image with bzip2""" | 290 | """Test compressing an image with bzip2""" |
291 | runCmd("wic create wictestdisk " | 291 | runCmd("wic create wictestdisk " |
292 | "--image-name=core-image-minimal " | 292 | "--image-name=core-image-minimal " |
293 | "-c bzip2 -o %s" % self.resultdir) | 293 | "-c bzip2 -o %s" % self.resultdir) |
294 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct.bz2"))) | 294 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "wictestdisk-*.direct.bz2")))) |
295 | 295 | ||
296 | def test_compress_xz(self): | 296 | def test_compress_xz(self): |
297 | """Test compressing an image with xz""" | 297 | """Test compressing an image with xz""" |
298 | runCmd("wic create wictestdisk " | 298 | runCmd("wic create wictestdisk " |
299 | "--image-name=core-image-minimal " | 299 | "--image-name=core-image-minimal " |
300 | "--compress-with=xz -o %s" % self.resultdir) | 300 | "--compress-with=xz -o %s" % self.resultdir) |
301 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct.xz"))) | 301 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "wictestdisk-*.direct.xz")))) |
302 | 302 | ||
303 | def test_wrong_compressor(self): | 303 | def test_wrong_compressor(self): |
304 | """Test how wic breaks if wrong compressor is provided""" | 304 | """Test how wic breaks if wrong compressor is provided""" |
@@ -312,23 +312,23 @@ class Wic(WicTestCase): | |||
312 | runCmd("wic create wictestdisk " | 312 | runCmd("wic create wictestdisk " |
313 | "--image-name=core-image-minimal " | 313 | "--image-name=core-image-minimal " |
314 | "-D -o %s" % self.resultdir) | 314 | "-D -o %s" % self.resultdir) |
315 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct"))) | 315 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "wictestdisk-*.direct")))) |
316 | self.assertEqual(1, len(glob(self.resultdir + "tmp.wic*"))) | 316 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "tmp.wic*")))) |
317 | 317 | ||
318 | def test_debug_long(self): | 318 | def test_debug_long(self): |
319 | """Test --debug option""" | 319 | """Test --debug option""" |
320 | runCmd("wic create wictestdisk " | 320 | runCmd("wic create wictestdisk " |
321 | "--image-name=core-image-minimal " | 321 | "--image-name=core-image-minimal " |
322 | "--debug -o %s" % self.resultdir) | 322 | "--debug -o %s" % self.resultdir) |
323 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct"))) | 323 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "wictestdisk-*.direct")))) |
324 | self.assertEqual(1, len(glob(self.resultdir + "tmp.wic*"))) | 324 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "tmp.wic*")))) |
325 | 325 | ||
326 | def test_skip_build_check_short(self): | 326 | def test_skip_build_check_short(self): |
327 | """Test -s option""" | 327 | """Test -s option""" |
328 | runCmd("wic create wictestdisk " | 328 | runCmd("wic create wictestdisk " |
329 | "--image-name=core-image-minimal " | 329 | "--image-name=core-image-minimal " |
330 | "-s -o %s" % self.resultdir) | 330 | "-s -o %s" % self.resultdir) |
331 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct"))) | 331 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "wictestdisk-*.direct")))) |
332 | 332 | ||
333 | def test_skip_build_check_long(self): | 333 | def test_skip_build_check_long(self): |
334 | """Test --skip-build-check option""" | 334 | """Test --skip-build-check option""" |
@@ -336,14 +336,14 @@ class Wic(WicTestCase): | |||
336 | "--image-name=core-image-minimal " | 336 | "--image-name=core-image-minimal " |
337 | "--skip-build-check " | 337 | "--skip-build-check " |
338 | "--outdir %s" % self.resultdir) | 338 | "--outdir %s" % self.resultdir) |
339 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct"))) | 339 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "wictestdisk-*.direct")))) |
340 | 340 | ||
341 | def test_build_rootfs_short(self): | 341 | def test_build_rootfs_short(self): |
342 | """Test -f option""" | 342 | """Test -f option""" |
343 | runCmd("wic create wictestdisk " | 343 | runCmd("wic create wictestdisk " |
344 | "--image-name=core-image-minimal " | 344 | "--image-name=core-image-minimal " |
345 | "-f -o %s" % self.resultdir) | 345 | "-f -o %s" % self.resultdir) |
346 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct"))) | 346 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "wictestdisk-*.direct")))) |
347 | 347 | ||
348 | def test_build_rootfs_long(self): | 348 | def test_build_rootfs_long(self): |
349 | """Test --build-rootfs option""" | 349 | """Test --build-rootfs option""" |
@@ -351,7 +351,7 @@ class Wic(WicTestCase): | |||
351 | "--image-name=core-image-minimal " | 351 | "--image-name=core-image-minimal " |
352 | "--build-rootfs " | 352 | "--build-rootfs " |
353 | "--outdir %s" % self.resultdir) | 353 | "--outdir %s" % self.resultdir) |
354 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*.direct"))) | 354 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "wictestdisk-*.direct")))) |
355 | 355 | ||
356 | # TODO this doesn't have to be x86-specific | 356 | # TODO this doesn't have to be x86-specific |
357 | @only_for_arch(['i586', 'i686', 'x86_64']) | 357 | @only_for_arch(['i586', 'i686', 'x86_64']) |
@@ -362,7 +362,7 @@ class Wic(WicTestCase): | |||
362 | "--rootfs rootfs1=core-image-minimal " | 362 | "--rootfs rootfs1=core-image-minimal " |
363 | "--rootfs rootfs2=core-image-minimal " | 363 | "--rootfs rootfs2=core-image-minimal " |
364 | "--outdir %s" % self.resultdir) | 364 | "--outdir %s" % self.resultdir) |
365 | self.assertEqual(1, len(glob(self.resultdir + "directdisk-multi-rootfs*.direct"))) | 365 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "directdisk-multi-rootfs*.direct")))) |
366 | 366 | ||
367 | # TODO this doesn't have to be x86-specific | 367 | # TODO this doesn't have to be x86-specific |
368 | @only_for_arch(['i586', 'i686', 'x86_64']) | 368 | @only_for_arch(['i586', 'i686', 'x86_64']) |
@@ -382,7 +382,7 @@ class Wic(WicTestCase): | |||
382 | "--rootfs-dir rootfs1=%(image_rootfs)s " | 382 | "--rootfs-dir rootfs1=%(image_rootfs)s " |
383 | "--rootfs-dir rootfs2=%(image_rootfs)s " | 383 | "--rootfs-dir rootfs2=%(image_rootfs)s " |
384 | "--outdir %(resultdir)s" % bbvars) | 384 | "--outdir %(resultdir)s" % bbvars) |
385 | self.assertEqual(1, len(glob(self.resultdir + "%(wks)s-*.direct" % bbvars))) | 385 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "%(wks)s-*.direct" % bbvars)))) |
386 | 386 | ||
387 | def test_exclude_path(self): | 387 | def test_exclude_path(self): |
388 | """Test --exclude-path wks option.""" | 388 | """Test --exclude-path wks option.""" |
@@ -403,7 +403,7 @@ part /etc --source rootfs --ondisk mmcblk0 --fstype=ext4 --exclude-path bin/ --r | |||
403 | % (wks_file, self.resultdir)) | 403 | % (wks_file, self.resultdir)) |
404 | 404 | ||
405 | os.remove(wks_file) | 405 | os.remove(wks_file) |
406 | wicout = glob(self.resultdir + "%s-*direct" % 'temp') | 406 | wicout = glob(os.path.join(self.resultdir, "%s-*direct" % 'temp')) |
407 | self.assertEqual(1, len(wicout)) | 407 | self.assertEqual(1, len(wicout)) |
408 | 408 | ||
409 | wicimg = wicout[0] | 409 | wicimg = wicout[0] |
@@ -691,7 +691,7 @@ part /etc --source rootfs --fstype=ext4 --change-directory=etc | |||
691 | 691 | ||
692 | # Get stock fstab from base-files recipe | 692 | # Get stock fstab from base-files recipe |
693 | bitbake('base-files -c do_install') | 693 | bitbake('base-files -c do_install') |
694 | bf_fstab = os.path.join(get_bb_var('D', 'base-files'), 'etc/fstab') | 694 | bf_fstab = os.path.join(get_bb_var('D', 'base-files'), 'etc', 'fstab') |
695 | self.assertEqual(True, os.path.exists(bf_fstab)) | 695 | self.assertEqual(True, os.path.exists(bf_fstab)) |
696 | bf_fstab_md5sum = runCmd('md5sum %s 2>/dev/null' % bf_fstab).output.split(" ")[0] | 696 | bf_fstab_md5sum = runCmd('md5sum %s 2>/dev/null' % bf_fstab).output.split(" ")[0] |
697 | 697 | ||
@@ -746,7 +746,7 @@ part /etc --source rootfs --fstype=ext4 --change-directory=etc | |||
746 | runCmd("wic create wictestdisk " | 746 | runCmd("wic create wictestdisk " |
747 | "--image-name core-image-minimal " | 747 | "--image-name core-image-minimal " |
748 | "--extra-space %i -o %s" % (extraspace ,self.resultdir)) | 748 | "--extra-space %i -o %s" % (extraspace ,self.resultdir)) |
749 | wicout = glob(self.resultdir + "wictestdisk-*.direct") | 749 | wicout = glob(os.path.join(self.resultdir, "wictestdisk-*.direct")) |
750 | self.assertEqual(1, len(wicout)) | 750 | self.assertEqual(1, len(wicout)) |
751 | size = os.path.getsize(wicout[0]) | 751 | size = os.path.getsize(wicout[0]) |
752 | self.assertTrue(size > extraspace) | 752 | self.assertTrue(size > extraspace) |
@@ -757,15 +757,15 @@ class Wic2(WicTestCase): | |||
757 | """Test generation of .bmap file -m option""" | 757 | """Test generation of .bmap file -m option""" |
758 | cmd = "wic create wictestdisk -e core-image-minimal -m -o %s" % self.resultdir | 758 | cmd = "wic create wictestdisk -e core-image-minimal -m -o %s" % self.resultdir |
759 | runCmd(cmd) | 759 | runCmd(cmd) |
760 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*direct"))) | 760 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "wictestdisk-*direct")))) |
761 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*direct.bmap"))) | 761 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "wictestdisk-*direct.bmap")))) |
762 | 762 | ||
763 | def test_bmap_long(self): | 763 | def test_bmap_long(self): |
764 | """Test generation of .bmap file --bmap option""" | 764 | """Test generation of .bmap file --bmap option""" |
765 | cmd = "wic create wictestdisk -e core-image-minimal --bmap -o %s" % self.resultdir | 765 | cmd = "wic create wictestdisk -e core-image-minimal --bmap -o %s" % self.resultdir |
766 | runCmd(cmd) | 766 | runCmd(cmd) |
767 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*direct"))) | 767 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "wictestdisk-*direct")))) |
768 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*direct.bmap"))) | 768 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "wictestdisk-*direct.bmap")))) |
769 | 769 | ||
770 | def test_image_env(self): | 770 | def test_image_env(self): |
771 | """Test generation of <image>.env files.""" | 771 | """Test generation of <image>.env files.""" |
@@ -801,7 +801,7 @@ class Wic2(WicTestCase): | |||
801 | "--image-name=%s -v %s -n %s -o %s" | 801 | "--image-name=%s -v %s -n %s -o %s" |
802 | % (image, imgenvdir, native_sysroot, | 802 | % (image, imgenvdir, native_sysroot, |
803 | self.resultdir)) | 803 | self.resultdir)) |
804 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*direct"))) | 804 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "wictestdisk-*direct")))) |
805 | 805 | ||
806 | def test_image_vars_dir_long(self): | 806 | def test_image_vars_dir_long(self): |
807 | """Test image vars directory selection --vars option""" | 807 | """Test image vars directory selection --vars option""" |
@@ -816,7 +816,7 @@ class Wic2(WicTestCase): | |||
816 | "--outdir %s" | 816 | "--outdir %s" |
817 | % (image, imgenvdir, native_sysroot, | 817 | % (image, imgenvdir, native_sysroot, |
818 | self.resultdir)) | 818 | self.resultdir)) |
819 | self.assertEqual(1, len(glob(self.resultdir + "wictestdisk-*direct"))) | 819 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "wictestdisk-*direct")))) |
820 | 820 | ||
821 | @only_for_arch(['i586', 'i686', 'x86_64', 'aarch64']) | 821 | @only_for_arch(['i586', 'i686', 'x86_64', 'aarch64']) |
822 | def test_wic_image_type(self): | 822 | def test_wic_image_type(self): |
@@ -899,7 +899,7 @@ class Wic2(WicTestCase): | |||
899 | 899 | ||
900 | wksname = os.path.splitext(os.path.basename(wkspath))[0] | 900 | wksname = os.path.splitext(os.path.basename(wkspath))[0] |
901 | 901 | ||
902 | wicout = glob(self.resultdir + "%s-*direct" % wksname) | 902 | wicout = glob(os.path.join(self.resultdir, "%s-*direct" % wksname)) |
903 | 903 | ||
904 | if not wicout: | 904 | if not wicout: |
905 | return (p, None) | 905 | return (p, None) |
@@ -1078,7 +1078,7 @@ class Wic2(WicTestCase): | |||
1078 | cmd = "wic create %s -e %s -o %s" % (wks.name, img, self.resultdir) | 1078 | cmd = "wic create %s -e %s -o %s" % (wks.name, img, self.resultdir) |
1079 | runCmd(cmd) | 1079 | runCmd(cmd) |
1080 | wksname = os.path.splitext(os.path.basename(wks.name))[0] | 1080 | wksname = os.path.splitext(os.path.basename(wks.name))[0] |
1081 | out = glob(self.resultdir + "%s-*direct" % wksname) | 1081 | out = glob(os.path.join(self.resultdir, "%s-*direct" % wksname)) |
1082 | self.assertEqual(1, len(out)) | 1082 | self.assertEqual(1, len(out)) |
1083 | 1083 | ||
1084 | def test_rawcopy_plugin(self): | 1084 | def test_rawcopy_plugin(self): |
@@ -1168,7 +1168,7 @@ class Wic2(WicTestCase): | |||
1168 | cmd = "wic create %s -e %s -o %s" % (wks.name, img, self.resultdir) | 1168 | cmd = "wic create %s -e %s -o %s" % (wks.name, img, self.resultdir) |
1169 | runCmd(cmd) | 1169 | runCmd(cmd) |
1170 | wksname = os.path.splitext(os.path.basename(wks.name))[0] | 1170 | wksname = os.path.splitext(os.path.basename(wks.name))[0] |
1171 | out = glob(self.resultdir + "%s-*.direct" % wksname) | 1171 | out = glob(os.path.join(self.resultdir, "%s-*.direct" % wksname)) |
1172 | self.assertEqual(1, len(out)) | 1172 | self.assertEqual(1, len(out)) |
1173 | 1173 | ||
1174 | # TODO this test could also work on aarch64 | 1174 | # TODO this test could also work on aarch64 |
@@ -1218,7 +1218,7 @@ class Wic2(WicTestCase): | |||
1218 | cmd = "wic create %s -e %s -o %s" % (wks.name, img, self.resultdir) | 1218 | cmd = "wic create %s -e %s -o %s" % (wks.name, img, self.resultdir) |
1219 | runCmd(cmd) | 1219 | runCmd(cmd) |
1220 | wksname = os.path.splitext(os.path.basename(wks.name))[0] | 1220 | wksname = os.path.splitext(os.path.basename(wks.name))[0] |
1221 | out = glob(self.resultdir + "%s-*direct" % wksname) | 1221 | out = glob(os.path.join(self.resultdir, "%s-*direct" % wksname)) |
1222 | self.assertEqual(1, len(out)) | 1222 | self.assertEqual(1, len(out)) |
1223 | 1223 | ||
1224 | def test_kickstart_parser(self): | 1224 | def test_kickstart_parser(self): |
@@ -1230,7 +1230,7 @@ class Wic2(WicTestCase): | |||
1230 | cmd = "wic create %s -e core-image-minimal -o %s" % (wks.name, self.resultdir) | 1230 | cmd = "wic create %s -e core-image-minimal -o %s" % (wks.name, self.resultdir) |
1231 | runCmd(cmd) | 1231 | runCmd(cmd) |
1232 | wksname = os.path.splitext(os.path.basename(wks.name))[0] | 1232 | wksname = os.path.splitext(os.path.basename(wks.name))[0] |
1233 | out = glob(self.resultdir + "%s-*direct" % wksname) | 1233 | out = glob(os.path.join(self.resultdir, "%s-*direct" % wksname)) |
1234 | self.assertEqual(1, len(out)) | 1234 | self.assertEqual(1, len(out)) |
1235 | 1235 | ||
1236 | def test_image_bootpart_globbed(self): | 1236 | def test_image_bootpart_globbed(self): |
@@ -1241,7 +1241,7 @@ class Wic2(WicTestCase): | |||
1241 | self.append_config(config) | 1241 | self.append_config(config) |
1242 | runCmd(cmd) | 1242 | runCmd(cmd) |
1243 | self.remove_config(config) | 1243 | self.remove_config(config) |
1244 | self.assertEqual(1, len(glob(self.resultdir + "sdimage-bootpart-*direct"))) | 1244 | self.assertEqual(1, len(glob(os.path.join(self.resultdir, "sdimage-bootpart-*direct")))) |
1245 | 1245 | ||
1246 | def test_sparse_copy(self): | 1246 | def test_sparse_copy(self): |
1247 | """Test sparse_copy with FIEMAP and SEEK_HOLE filemap APIs""" | 1247 | """Test sparse_copy with FIEMAP and SEEK_HOLE filemap APIs""" |
@@ -1287,7 +1287,7 @@ class Wic2(WicTestCase): | |||
1287 | cmd = "wic create %s -e %s -o %s" % (wks.name, img, self.resultdir) | 1287 | cmd = "wic create %s -e %s -o %s" % (wks.name, img, self.resultdir) |
1288 | runCmd(cmd) | 1288 | runCmd(cmd) |
1289 | wksname = os.path.splitext(os.path.basename(wks.name))[0] | 1289 | wksname = os.path.splitext(os.path.basename(wks.name))[0] |
1290 | out = glob(self.resultdir + "%s-*direct" % wksname) | 1290 | out = glob(os.path.join(self.resultdir, "%s-*direct" % wksname)) |
1291 | self.assertEqual(1, len(out)) | 1291 | self.assertEqual(1, len(out)) |
1292 | 1292 | ||
1293 | @only_for_arch(['i586', 'i686', 'x86_64']) | 1293 | @only_for_arch(['i586', 'i686', 'x86_64']) |
@@ -1351,7 +1351,7 @@ class ModifyTests(WicTestCase): | |||
1351 | runCmd("wic create wictestdisk " | 1351 | runCmd("wic create wictestdisk " |
1352 | "--image-name=core-image-minimal " | 1352 | "--image-name=core-image-minimal " |
1353 | "-D -o %s" % self.resultdir) | 1353 | "-D -o %s" % self.resultdir) |
1354 | images = glob(self.resultdir + "wictestdisk-*.direct") | 1354 | images = glob(os.path.join(self.resultdir, "wictestdisk-*.direct")) |
1355 | self.assertEqual(1, len(images)) | 1355 | self.assertEqual(1, len(images)) |
1356 | 1356 | ||
1357 | sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools') | 1357 | sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools') |
@@ -1369,7 +1369,7 @@ class ModifyTests(WicTestCase): | |||
1369 | runCmd("wic create wictestdisk " | 1369 | runCmd("wic create wictestdisk " |
1370 | "--image-name=core-image-minimal " | 1370 | "--image-name=core-image-minimal " |
1371 | "-D -o %s" % self.resultdir) | 1371 | "-D -o %s" % self.resultdir) |
1372 | images = glob(self.resultdir + "wictestdisk-*.direct") | 1372 | images = glob(os.path.join(self.resultdir, "wictestdisk-*.direct")) |
1373 | self.assertEqual(1, len(images)) | 1373 | self.assertEqual(1, len(images)) |
1374 | 1374 | ||
1375 | sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools') | 1375 | sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools') |
@@ -1415,7 +1415,7 @@ class ModifyTests(WicTestCase): | |||
1415 | runCmd("wic create mkefidisk " | 1415 | runCmd("wic create mkefidisk " |
1416 | "--image-name=core-image-minimal " | 1416 | "--image-name=core-image-minimal " |
1417 | "-D -o %s" % self.resultdir) | 1417 | "-D -o %s" % self.resultdir) |
1418 | images = glob(self.resultdir + "mkefidisk-*.direct") | 1418 | images = glob(os.path.join(self.resultdir, "mkefidisk-*.direct")) |
1419 | self.assertEqual(1, len(images)) | 1419 | self.assertEqual(1, len(images)) |
1420 | 1420 | ||
1421 | sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools') | 1421 | sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools') |
@@ -1443,7 +1443,7 @@ class ModifyTests(WicTestCase): | |||
1443 | runCmd("wic create wictestdisk " | 1443 | runCmd("wic create wictestdisk " |
1444 | "--image-name=core-image-minimal " | 1444 | "--image-name=core-image-minimal " |
1445 | "-D -o %s" % self.resultdir) | 1445 | "-D -o %s" % self.resultdir) |
1446 | images = glob(self.resultdir + "wictestdisk-*.direct") | 1446 | images = glob(os.path.join(self.resultdir, "wictestdisk-*.direct")) |
1447 | self.assertEqual(1, len(images)) | 1447 | self.assertEqual(1, len(images)) |
1448 | 1448 | ||
1449 | sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools') | 1449 | sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools') |
@@ -1458,7 +1458,7 @@ class ModifyTests(WicTestCase): | |||
1458 | runCmd("wic create wictestdisk " | 1458 | runCmd("wic create wictestdisk " |
1459 | "--image-name=core-image-minimal " | 1459 | "--image-name=core-image-minimal " |
1460 | "-D -o %s" % self.resultdir) | 1460 | "-D -o %s" % self.resultdir) |
1461 | images = glob(self.resultdir + "wictestdisk-*.direct") | 1461 | images = glob(os.path.join(self.resultdir, "wictestdisk-*.direct")) |
1462 | self.assertEqual(1, len(images)) | 1462 | self.assertEqual(1, len(images)) |
1463 | 1463 | ||
1464 | sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools') | 1464 | sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools') |
@@ -1494,7 +1494,7 @@ class ModifyTests(WicTestCase): | |||
1494 | runCmd("wic create mkefidisk " | 1494 | runCmd("wic create mkefidisk " |
1495 | "--image-name=core-image-minimal " | 1495 | "--image-name=core-image-minimal " |
1496 | "-D -o %s" % self.resultdir) | 1496 | "-D -o %s" % self.resultdir) |
1497 | images = glob(self.resultdir + "mkefidisk-*.direct") | 1497 | images = glob(os.path.join(self.resultdir, "mkefidisk-*.direct")) |
1498 | self.assertEqual(1, len(images)) | 1498 | self.assertEqual(1, len(images)) |
1499 | 1499 | ||
1500 | sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools') | 1500 | sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools') |