[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3855/8267] Revert "selftest/wic: extending test coverage for WIC script options"
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 3855/8267] Revert "selftest/wic: extending test coverage for WIC script options"
- Date: Sun, 17 Dec 2017 01:13:08 +0000 (UTC)
commit 8ccf396c7284acd7e0fdf95473d317d23d05475f
Author: Richard Purdie <richard purdie linuxfoundation org>
Date: Tue Dec 20 17:06:01 2016 +0000
Revert "selftest/wic: extending test coverage for WIC script options"
This reverts commit 68cb3180c1b0dcee50812b21f98850d188d8621b as this wasn't
ready for merge and there are new better versions.
Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
meta/lib/oeqa/selftest/wic.py | 246 ++++++++++++-----------------------------
1 files changed, 72 insertions(+), 174 deletions(-)
---
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index 46bfb94..e652fad 100644
--- a/meta/lib/oeqa/selftest/wic.py
+++ b/meta/lib/oeqa/selftest/wic.py
@@ -37,13 +37,13 @@ class Wic(oeSelfTest):
"""Wic test class."""
resultdir = "/var/tmp/wic/build/"
- alternate_resultdir = "/var/tmp/wic/build/alt/"
image_is_ready = False
def setUpLocal(self):
"""This code is executed before each test method."""
self.write_config('IMAGE_FSTYPES += " hddimg"\n'
- 'MACHINE_FEATURES_append = " efi"\n')
+ 'MACHINE_FEATURES_append = " efi"\n'
+ 'WKS_FILE = "wic-image-minimal"\n')
# Do this here instead of in setUpClass as the base setUp does some
# clean up which can result in the native tools built earlier in
@@ -56,16 +56,10 @@ class Wic(oeSelfTest):
rmtree(self.resultdir, ignore_errors=True)
- @testcase(1552)
- def test_version(self):
- """Test wic --version"""
- self.assertEqual(0, runCmd('wic --version').status)
-
@testcase(1208)
def test_help(self):
- """Test wic --help and wic -h"""
+ """Test wic --help"""
self.assertEqual(0, runCmd('wic --help').status)
- self.assertEqual(0, runCmd('wic -h').status)
@testcase(1209)
def test_createhelp(self):
@@ -77,74 +71,19 @@ class Wic(oeSelfTest):
"""Test wic list --help"""
self.assertEqual(0, runCmd('wic list --help').status)
- @testcase(1553)
- def test_help_create(self):
- """Test wic help create"""
- self.assertEqual(0, runCmd('wic help create').status)
-
- @testcase(1554)
- def test_help_list(self):
- """Test wic help list"""
- self.assertEqual(0, runCmd('wic help list').status)
-
- @testcase(1215)
- def test_help_overview(self):
- """Test wic help overview"""
- self.assertEqual(0, runCmd('wic help overview').status)
-
- @testcase(1216)
- def test_help_plugins(self):
- """Test wic help plugins"""
- self.assertEqual(0, runCmd('wic help plugins').status)
-
- @testcase(1217)
- def test_help_kickstart(self):
- """Test wic help kickstart"""
- self.assertEqual(0, runCmd('wic help kickstart').status)
-
- @testcase(1555)
- def test_list_images(self):
- """Test wic list images"""
- self.assertEqual(0, runCmd('wic list images').status)
-
- @testcase(1556)
- def test_list_source_plugins(self):
- """Test wic list source-plugins"""
- self.assertEqual(0, runCmd('wic list source-plugins').status)
-
- @testcase(1557)
- def test_listed_images_help(self):
- """Test wic listed images help"""
- output = runCmd('wic list images').output
- imageDetails = [line.split() for line in output.split('\n')]
- imageList = [row[0] for row in imageDetails]
- for image in imageList:
- self.assertEqual(0, runCmd('wic list %s help' % image).status)
-
- @testcase(1213)
- def test_unsupported_subcommand(self):
- """Test unsupported subcommand"""
- self.assertEqual(1, runCmd('wic unsupported',
- ignore_status=True).status)
-
- @testcase(1214)
- def test_no_command(self):
- """Test wic without command"""
- self.assertEqual(1, runCmd('wic', ignore_status=True).status)
-
@testcase(1211)
def test_build_image_name(self):
"""Test wic create directdisk --image-name core-image-minimal"""
self.assertEqual(0, runCmd("wic create directdisk "
- "--image-name=core-image-minimal").status)
+ "--image-name core-image-minimal").status)
self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct")))
@testcase(1212)
def test_build_artifacts(self):
"""Test wic create directdisk providing all artifacts."""
- bbvars = dict((var.lower(), get_bb_var(var, 'core-image-minimal'))
- for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE',
- 'STAGING_DIR_NATIVE', 'IMAGE_ROOTFS'))
+ bbvars = dict((var.lower(), get_bb_var(var, 'core-image-minimal')) \
+ for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE',
+ 'STAGING_DIR_NATIVE', 'IMAGE_ROOTFS'))
status = runCmd("wic create directdisk "
"-b %(staging_datadir)s "
"-k %(deploy_dir_image)s "
@@ -157,110 +96,113 @@ class Wic(oeSelfTest):
def test_gpt_image(self):
"""Test creation of core-image-minimal with gpt table and UUID boot"""
self.assertEqual(0, runCmd("wic create directdisk-gpt "
- "--image-name core-image-minimal "
- ).status)
+ "--image-name core-image-minimal").status)
self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct")))
+ @testcase(1213)
+ def test_unsupported_subcommand(self):
+ """Test unsupported subcommand"""
+ self.assertEqual(1, runCmd('wic unsupported',
+ ignore_status=True).status)
+
+ @testcase(1214)
+ def test_no_command(self):
+ """Test wic without command"""
+ self.assertEqual(1, runCmd('wic', ignore_status=True).status)
+
+ @testcase(1215)
+ def test_help_overview(self):
+ """Test wic help overview"""
+ self.assertEqual(0, runCmd('wic help overview').status)
+
+ @testcase(1216)
+ def test_help_plugins(self):
+ """Test wic help plugins"""
+ self.assertEqual(0, runCmd('wic help plugins').status)
+
+ @testcase(1217)
+ def test_help_kickstart(self):
+ """Test wic help kickstart"""
+ self.assertEqual(0, runCmd('wic help kickstart').status)
+
@testcase(1264)
def test_compress_gzip(self):
"""Test compressing an image with gzip"""
self.assertEqual(0, runCmd("wic create directdisk "
- "-e core-image-minimal "
+ "--image-name core-image-minimal "
"-c gzip").status)
- self.assertEqual(1, len(glob(self.resultdir +
- "directdisk-*.direct.gz")))
+ self.assertEqual(1, len(glob(self.resultdir + \
+ "directdisk-*.direct.gz")))
@testcase(1265)
def test_compress_bzip2(self):
"""Test compressing an image with bzip2"""
self.assertEqual(0, runCmd("wic create directdisk "
- "--image-name=core-image-minimal "
+ "--image-name core-image-minimal "
"-c bzip2").status)
- self.assertEqual(1, len(glob(self.resultdir +
- "directdisk-*.direct.bz2")))
+ self.assertEqual(1, len(glob(self.resultdir + \
+ "directdisk-*.direct.bz2")))
@testcase(1266)
def test_compress_xz(self):
"""Test compressing an image with xz"""
self.assertEqual(0, runCmd("wic create directdisk "
- "--image-name=core-image-minimal "
- "--compress-with=xz").status)
- self.assertEqual(1, len(glob(self.resultdir +
- "directdisk-*.direct.xz")))
+ "--image-name core-image-minimal "
+ "-c xz").status)
+ self.assertEqual(1, len(glob(self.resultdir + \
+ "directdisk-*.direct.xz")))
@testcase(1267)
def test_wrong_compressor(self):
"""Test how wic breaks if wrong compressor is provided"""
self.assertEqual(2, runCmd("wic create directdisk "
- "--image-name=core-image-minimal "
+ "--image-name core-image-minimal "
"-c wrong", ignore_status=True).status)
- @testcase(1558)
- def test_debug_skip_build_check_and_build_rootfs(self):
- """Test wic debug, skip-build-check and build_rootfs"""
- self.assertEqual(0, runCmd("wic create directdisk "
- "--image-name=core-image-minimal "
- "-D -s -f").status)
- self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct")))
- self.assertEqual(0, runCmd("wic create directdisk "
- "--image-name=core-image-minimal "
- "--debug "
- "--skip-build-check "
- "--build-rootfs").status)
- self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct")))
-
@testcase(1268)
def test_rootfs_indirect_recipes(self):
"""Test usage of rootfs plugin with rootfs recipes"""
wks = "directdisk-multi-rootfs"
self.assertEqual(0, runCmd("wic create %s "
- "--image-name=core-image-minimal "
+ "--image-name core-image-minimal "
"--rootfs rootfs1=core-image-minimal "
- "--rootfs rootfs2=core-image-minimal"
+ "--rootfs rootfs2=core-image-minimal" \
% wks).status)
self.assertEqual(1, len(glob(self.resultdir + "%s*.direct" % wks)))
@testcase(1269)
def test_rootfs_artifacts(self):
"""Test usage of rootfs plugin with rootfs paths"""
- bbvars = dict((var.lower(), get_bb_var(var, 'core-image-minimal'))
- for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE',
- 'STAGING_DIR_NATIVE', 'IMAGE_ROOTFS'))
+ bbvars = dict((var.lower(), get_bb_var(var, 'core-image-minimal')) \
+ for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE',
+ 'STAGING_DIR_NATIVE', 'IMAGE_ROOTFS'))
bbvars['wks'] = "directdisk-multi-rootfs"
status = runCmd("wic create %(wks)s "
- "--bootimg-dir=%(staging_datadir)s "
- "--kernel-dir=%(deploy_dir_image)s "
- "--native-sysroot=%(staging_dir_native)s "
+ "-b %(staging_datadir)s "
+ "-k %(deploy_dir_image)s "
+ "-n %(staging_dir_native)s "
"--rootfs-dir rootfs1=%(image_rootfs)s "
- "--rootfs-dir rootfs2=%(image_rootfs)s"
+ "--rootfs-dir rootfs2=%(image_rootfs)s" \
% bbvars).status
self.assertEqual(0, status)
- self.assertEqual(1, len(glob(self.resultdir +
+ self.assertEqual(1, len(glob(self.resultdir + \
"%(wks)s-*.direct" % bbvars)))
@testcase(1346)
def test_iso_image(self):
"""Test creation of hybrid iso image with legacy and EFI boot"""
self.assertEqual(0, runCmd("wic create mkhybridiso "
- "--image-name core-image-minimal"
- ).status)
- self.assertEqual(1, len(glob(self.resultdir +
- "HYBRID_ISO_IMG-*.direct")))
- self.assertEqual(1, len(glob(self.resultdir +
- "HYBRID_ISO_IMG-*.iso")))
-
- def __get_image_env_path(self, image):
- """Generate and obtain the path to <image>.env"""
- self.assertEqual(0, bitbake('%s -c do_rootfs_wicenv' % image).status)
- stdir = get_bb_var('STAGING_DIR_TARGET', image)
- imgdatadir = os.path.join(stdir, 'imgdata')
- return imgdatadir
+ "--image-name core-image-minimal").status)
+ self.assertEqual(1, len(glob(self.resultdir + "HYBRID_ISO_IMG-*.direct")))
+ self.assertEqual(1, len(glob(self.resultdir + "HYBRID_ISO_IMG-*.iso")))
@testcase(1347)
def test_image_env(self):
- """Test generation of <image>.env files"""
+ """Test generation of <image>.env files."""
image = 'core-image-minimal'
- imgdatadir = self.__get_image_env_path(image)
+ self.assertEqual(0, bitbake('%s -c do_rootfs_wicenv' % image).status)
+ stdir = get_bb_var('STAGING_DIR_TARGET', image)
+ imgdatadir = os.path.join(stdir, 'imgdata')
basename = get_bb_var('IMAGE_BASENAME', image)
self.assertEqual(basename, image)
@@ -278,21 +220,6 @@ class Wic(oeSelfTest):
self.assertTrue(var in content, "%s is not in .env file" % var)
self.assertTrue(content[var])
- @testcase(1559)
- def test_image_vars_dir(self):
- """Test image vars directory selection"""
- image = 'core-image-minimal'
- imgenvdir = self.__get_image_env_path(image)
-
- self.assertEqual(0, runCmd("wic create directdisk "
- "--image-name=%s "
- "-v %s"
- % (image, imgenvdir)).status)
- self.assertEqual(0, runCmd("wic create directdisk "
- "--image-name=%s "
- "--vars %s"
- % (image, imgenvdir)).status)
-
@testcase(1351)
def test_wic_image_type(self):
"""Test building wic images by bitbake"""
@@ -312,7 +239,7 @@ class Wic(oeSelfTest):
def test_qemux86_directdisk(self):
"""Test creation of qemux-86-directdisk image"""
image = "qemux86-directdisk"
- self.assertEqual(0, runCmd("wic create %s -e core-image-minimal"
+ self.assertEqual(0, runCmd("wic create %s -e core-image-minimal" \
% image).status)
self.assertEqual(1, len(glob(self.resultdir + "%s-*direct" % image)))
@@ -320,8 +247,7 @@ class Wic(oeSelfTest):
def test_mkgummidisk(self):
"""Test creation of mkgummidisk image"""
image = "mkgummidisk"
- self.assertEqual(0, runCmd("wic create %s --image-name "
- "core-image-minimal"
+ self.assertEqual(0, runCmd("wic create %s -e core-image-minimal" \
% image).status)
self.assertEqual(1, len(glob(self.resultdir + "%s-*direct" % image)))
@@ -329,7 +255,7 @@ class Wic(oeSelfTest):
def test_mkefidisk(self):
"""Test creation of mkefidisk image"""
image = "mkefidisk"
- self.assertEqual(0, runCmd("wic create %s -e core-image-minimal"
+ self.assertEqual(0, runCmd("wic create %s -e core-image-minimal" \
% image).status)
self.assertEqual(1, len(glob(self.resultdir + "%s-*direct" % image)))
@@ -337,11 +263,11 @@ class Wic(oeSelfTest):
def test_directdisk_bootloader_config(self):
"""Test creation of directdisk-bootloader-config image"""
image = "directdisk-bootloader-config"
- self.assertEqual(0, runCmd("wic create %s -e core-image-minimal"
+ self.assertEqual(0, runCmd("wic create %s -e core-image-minimal" \
% image).status)
self.assertEqual(1, len(glob(self.resultdir + "%s-*direct" % image)))
- @testcase(1424)
+ @testcase(1422)
def test_qemu(self):
"""Test wic-image-minimal under qemu"""
self.assertEqual(0, bitbake('wic-image-minimal').status)
@@ -349,56 +275,28 @@ class Wic(oeSelfTest):
with runqemu('wic-image-minimal', ssh=False) as qemu:
command = "mount |grep '^/dev/' | cut -f1,3 -d ' '"
status, output = qemu.run_serial(command)
- self.assertEqual(1, status, 'Failed to run command "%s": %s'
- % (command, output))
+ self.assertEqual(1, status, 'Failed to run command "%s": %s' % (command, output))
self.assertEqual(output, '/dev/root /\r\n/dev/vda3 /mnt')
- @testcase(1496)
def test_bmap(self):
"""Test generation of .bmap file"""
image = "directdisk"
- status = runCmd("wic create %s -e core-image-minimal -m"
- % image).status
- self.assertEqual(0, status)
- self.assertEqual(1, len(glob(self.resultdir + "%s-*direct" % image)))
- self.assertEqual(1, len(glob(self.resultdir +
- "%s-*direct.bmap" % image)))
- status = runCmd("wic create %s -e core-image-minimal --bmap"
- % image).status
+ status = runCmd("wic create %s -e core-image-minimal --bmap" % image).status
self.assertEqual(0, status)
self.assertEqual(1, len(glob(self.resultdir + "%s-*direct" % image)))
- self.assertEqual(1, len(glob(self.resultdir + "%s-*direct.bmap"
- % image)))
+ self.assertEqual(1, len(glob(self.resultdir + "%s-*direct.bmap" % image)))
- @testcase(1560)
def test_systemd_bootdisk(self):
"""Test creation of systemd-bootdisk image"""
image = "systemd-bootdisk"
- self.assertEqual(0, runCmd("wic create %s -e core-image-minimal"
+ self.assertEqual(0, runCmd("wic create %s -e core-image-minimal" \
% image).status)
self.assertEqual(1, len(glob(self.resultdir + "%s-*direct" % image)))
- @testcase(1561)
def test_sdimage_bootpart(self):
"""Test creation of sdimage-bootpart image"""
image = "sdimage-bootpart"
self.write_config('IMAGE_BOOT_FILES = "bzImage"\n')
- self.assertEqual(0, runCmd("wic create %s -e core-image-minimal"
+ self.assertEqual(0, runCmd("wic create %s -e core-image-minimal" \
% image).status)
self.assertEqual(1, len(glob(self.resultdir + "%s-*direct" % image)))
-
- @testcase(1562)
- def test_alternate_output_dir(self):
- """Test alternate output directory"""
- self.assertEqual(0, runCmd("wic create directdisk "
- "-e core-image-minimal "
- "-o %s"
- % self.alternate_resultdir).status)
- self.assertEqual(1, len(glob(self.alternate_resultdir +
- "build/directdisk-*.direct")))
- self.assertEqual(0, runCmd("wic create mkefidisk -e "
- "core-image-minimal "
- "--outdir %s"
- % self.alternate_resultdir).status)
- self.assertEqual(1, len(glob(self.alternate_resultdir +
- "build/mkefidisk-*direct")))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
