From 2a4ecc88ca10ef6abe55dddb96842b579b73497c Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 16 Oct 2015 11:43:06 +0100 Subject: oeqa/selftest/wic: remove numbers from test names There isn't any required ordering of tests, and the numbers meant that the tests didn't appear in oe-selftest --list-classes. Signed-off-by: Ross Burton --- meta/lib/oeqa/selftest/wic.py | 46 +++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'meta/lib/oeqa/selftest/wic.py') diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py index ca9a5981bd..ea78e22594 100644 --- a/meta/lib/oeqa/selftest/wic.py +++ b/meta/lib/oeqa/selftest/wic.py @@ -56,29 +56,29 @@ class Wic(oeSelfTest): rmtree(self.resultdir, ignore_errors=True) @testcase(1208) - def test01_help(self): + def test_help(self): """Test wic --help""" self.assertEqual(0, runCmd('wic --help').status) @testcase(1209) - def test02_createhelp(self): + def test_createhelp(self): """Test wic create --help""" self.assertEqual(0, runCmd('wic create --help').status) @testcase(1210) - def test03_listhelp(self): + def test_listhelp(self): """Test wic list --help""" self.assertEqual(0, runCmd('wic list --help').status) @testcase(1211) - def test04_build_image_name(self): + 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) self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct"))) @testcase(1212) - def test05_build_artifacts(self): + def test_build_artifacts(self): """Test wic create directdisk providing all artifacts.""" vars = dict((var.lower(), get_bb_var(var, 'core-image-minimal')) \ for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE', @@ -92,40 +92,40 @@ class Wic(oeSelfTest): self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct"))) @testcase(1157) - def test06_gpt_image(self): + 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) self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct"))) @testcase(1213) - def test07_unsupported_subcommand(self): + def test_unsupported_subcommand(self): """Test unsupported subcommand""" self.assertEqual(1, runCmd('wic unsupported', ignore_status=True).status) @testcase(1214) - def test08_no_command(self): + def test_no_command(self): """Test wic without command""" self.assertEqual(1, runCmd('wic', ignore_status=True).status) @testcase(1215) - def test09_help_overview(self): + def test_help_overview(self): """Test wic help overview""" self.assertEqual(0, runCmd('wic help overview').status) @testcase(1216) - def test10_help_plugins(self): + def test_help_plugins(self): """Test wic help plugins""" self.assertEqual(0, runCmd('wic help plugins').status) @testcase(1217) - def test11_help_kickstart(self): + def test_help_kickstart(self): """Test wic help kickstart""" self.assertEqual(0, runCmd('wic help kickstart').status) @testcase(1264) - def test12_compress_gzip(self): + def test_compress_gzip(self): """Test compressing an image with gzip""" self.assertEqual(0, runCmd("wic create directdisk " "--image-name core-image-minimal " @@ -134,7 +134,7 @@ class Wic(oeSelfTest): "directdisk-*.direct.gz"))) @testcase(1265) - def test13_compress_bzip2(self): + def test_compress_bzip2(self): """Test compressing an image with bzip2""" self.assertEqual(0, runCmd("wic create directdisk " "--image-name core-image-minimal " @@ -143,7 +143,7 @@ class Wic(oeSelfTest): "directdisk-*.direct.bz2"))) @testcase(1266) - def test14_compress_xz(self): + def test_compress_xz(self): """Test compressing an image with xz""" self.assertEqual(0, runCmd("wic create directdisk " "--image-name core-image-minimal " @@ -152,14 +152,14 @@ class Wic(oeSelfTest): "directdisk-*.direct.xz"))) @testcase(1267) - def test15_wrong_compressor(self): + 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 " "-c wrong", ignore_status=True).status) @testcase(1268) - def test16_rootfs_indirect_recipes(self): + 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 " @@ -170,7 +170,7 @@ class Wic(oeSelfTest): self.assertEqual(1, len(glob(self.resultdir + "%s*.direct" % wks))) @testcase(1269) - def test17_rootfs_artifacts(self): + def test_rootfs_artifacts(self): """Test usage of rootfs plugin with rootfs paths""" vars = dict((var.lower(), get_bb_var(var, 'core-image-minimal')) \ for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE', @@ -188,7 +188,7 @@ class Wic(oeSelfTest): "%(wks)s-*.direct" % vars))) @testcase(1346) - def test18_iso_image(self): + 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) @@ -196,7 +196,7 @@ class Wic(oeSelfTest): self.assertEqual(1, len(glob(self.resultdir + "HYBRID_ISO_IMG-*.iso"))) @testcase(1347) - def test19_image_env(self): + def test_image_env(self): """Test generation of .env files.""" image = 'core-image-minimal' stdir = get_bb_var('STAGING_DIR_TARGET', image) @@ -219,7 +219,7 @@ class Wic(oeSelfTest): self.assertTrue(content[var]) @testcase(1351) - def test20_wic_image_type(self): + def test_wic_image_type(self): """Test building wic images by bitbake""" self.assertEqual(0, bitbake('wic-image-minimal').status) @@ -234,7 +234,7 @@ class Wic(oeSelfTest): self.assertTrue(os.path.isfile(os.path.realpath(path))) @testcase(1348) - def test21_qemux86_directdisk(self): + 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" \ @@ -242,7 +242,7 @@ class Wic(oeSelfTest): self.assertEqual(1, len(glob(self.resultdir + "%s-*direct" % image))) @testcase(1349) - def test22_mkgummidisk(self): + def test_mkgummidisk(self): """Test creation of mkgummidisk image""" image = "mkgummidisk" self.assertEqual(0, runCmd("wic create %s -e core-image-minimal" \ @@ -250,7 +250,7 @@ class Wic(oeSelfTest): self.assertEqual(1, len(glob(self.resultdir + "%s-*direct" % image))) @testcase(1350) - def test23_mkefidisk(self): + def test_mkefidisk(self): """Test creation of mkefidisk image""" image = "mkefidisk" self.assertEqual(0, runCmd("wic create %s -e core-image-minimal" \ -- cgit 1.2.3-korg