summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/selftest
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-08 16:56:32 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-09 16:31:55 +0100
commitc7592b01478def091b6787412390c61e7ce0a0cd (patch)
tree3c2f26480c6e16fae0ad65b032e3dc0fccfca71b /meta/lib/oeqa/selftest
parentc0dc72bad92e2e4dc0aedb48b969709f821baf73 (diff)
downloadpoky-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')
-rw-r--r--meta/lib/oeqa/selftest/cases/archiver.py4
-rw-r--r--meta/lib/oeqa/selftest/cases/bblayers.py8
-rw-r--r--meta/lib/oeqa/selftest/cases/bbtests.py26
-rw-r--r--meta/lib/oeqa/selftest/cases/buildoptions.py10
-rw-r--r--meta/lib/oeqa/selftest/cases/containerimage.py2
-rw-r--r--meta/lib/oeqa/selftest/cases/devtool.py39
-rw-r--r--meta/lib/oeqa/selftest/cases/distrodata.py2
-rw-r--r--meta/lib/oeqa/selftest/cases/eSDK.py3
-rw-r--r--meta/lib/oeqa/selftest/cases/fetch.py2
-rw-r--r--meta/lib/oeqa/selftest/cases/image_typedep.py2
-rw-r--r--meta/lib/oeqa/selftest/cases/imagefeatures.py9
-rw-r--r--meta/lib/oeqa/selftest/cases/layerappend.py2
-rw-r--r--meta/lib/oeqa/selftest/cases/liboe.py4
-rw-r--r--meta/lib/oeqa/selftest/cases/lic_checksum.py2
-rw-r--r--meta/lib/oeqa/selftest/cases/manifest.py3
-rw-r--r--meta/lib/oeqa/selftest/cases/meta_ide.py4
-rw-r--r--meta/lib/oeqa/selftest/cases/oelib/buildhistory.py4
-rw-r--r--meta/lib/oeqa/selftest/cases/oescripts.py2
-rw-r--r--meta/lib/oeqa/selftest/cases/package.py4
-rw-r--r--meta/lib/oeqa/selftest/cases/pkgdata.py9
-rw-r--r--meta/lib/oeqa/selftest/cases/prservice.py10
-rw-r--r--meta/lib/oeqa/selftest/cases/recipetool.py39
-rw-r--r--meta/lib/oeqa/selftest/cases/recipeutils.py1
-rw-r--r--meta/lib/oeqa/selftest/cases/runcmd.py17
-rw-r--r--meta/lib/oeqa/selftest/cases/runqemu.py13
-rw-r--r--meta/lib/oeqa/selftest/cases/runtime_test.py9
-rw-r--r--meta/lib/oeqa/selftest/cases/selftest.py2
-rw-r--r--meta/lib/oeqa/selftest/cases/signing.py4
-rw-r--r--meta/lib/oeqa/selftest/cases/sstatetests.py21
-rw-r--r--meta/lib/oeqa/selftest/cases/tinfoil.py11
-rw-r--r--meta/lib/oeqa/selftest/cases/wic.py59
31 files changed, 0 insertions, 327 deletions
diff --git a/meta/lib/oeqa/selftest/cases/archiver.py b/meta/lib/oeqa/selftest/cases/archiver.py
index 0a6d4e325f..f450777c8d 100644
--- a/meta/lib/oeqa/selftest/cases/archiver.py
+++ b/meta/lib/oeqa/selftest/cases/archiver.py
@@ -2,11 +2,9 @@ import os
2import glob 2import glob
3from oeqa.utils.commands import bitbake, get_bb_vars 3from oeqa.utils.commands import bitbake, get_bb_vars
4from oeqa.selftest.case import OESelftestTestCase 4from oeqa.selftest.case import OESelftestTestCase
5from oeqa.core.decorator.oeid import OETestID
6 5
7class Archiver(OESelftestTestCase): 6class Archiver(OESelftestTestCase):
8 7
9 @OETestID(1345)
10 def test_archiver_allows_to_filter_on_recipe_name(self): 8 def test_archiver_allows_to_filter_on_recipe_name(self):
11 """ 9 """
12 Summary: The archiver should offer the possibility to filter on the recipe. (#6929) 10 Summary: The archiver should offer the possibility to filter on the recipe. (#6929)
@@ -40,7 +38,6 @@ class Archiver(OESelftestTestCase):
40 excluded_present = len(glob.glob(src_path + '/%s-*' % exclude_recipe)) 38 excluded_present = len(glob.glob(src_path + '/%s-*' % exclude_recipe))
41 self.assertFalse(excluded_present, 'Recipe %s was not excluded.' % exclude_recipe) 39 self.assertFalse(excluded_present, 'Recipe %s was not excluded.' % exclude_recipe)
42 40
43 @OETestID(1900)
44 def test_archiver_filters_by_type(self): 41 def test_archiver_filters_by_type(self):
45 """ 42 """
46 Summary: The archiver is documented to filter on the recipe type. 43 Summary: The archiver is documented to filter on the recipe type.
@@ -73,7 +70,6 @@ class Archiver(OESelftestTestCase):
73 excluded_present = len(glob.glob(src_path_native + '/%s-*' % native_recipe)) 70 excluded_present = len(glob.glob(src_path_native + '/%s-*' % native_recipe))
74 self.assertFalse(excluded_present, 'Recipe %s was not excluded.' % native_recipe) 71 self.assertFalse(excluded_present, 'Recipe %s was not excluded.' % native_recipe)
75 72
76 @OETestID(1901)
77 def test_archiver_filters_by_type_and_name(self): 73 def test_archiver_filters_by_type_and_name(self):
78 """ 74 """
79 Summary: Test that the archiver archives by recipe type, taking the 75 Summary: Test that the archiver archives by recipe type, taking the
diff --git a/meta/lib/oeqa/selftest/cases/bblayers.py b/meta/lib/oeqa/selftest/cases/bblayers.py
index 447c54b7e6..6ec5fb819e 100644
--- a/meta/lib/oeqa/selftest/cases/bblayers.py
+++ b/meta/lib/oeqa/selftest/cases/bblayers.py
@@ -5,33 +5,27 @@ import oeqa.utils.ftools as ftools
5from oeqa.utils.commands import runCmd, get_bb_var, get_bb_vars 5from oeqa.utils.commands import runCmd, get_bb_var, get_bb_vars
6 6
7from oeqa.selftest.case import OESelftestTestCase 7from oeqa.selftest.case import OESelftestTestCase
8from oeqa.core.decorator.oeid import OETestID
9 8
10class BitbakeLayers(OESelftestTestCase): 9class BitbakeLayers(OESelftestTestCase):
11 10
12 @OETestID(756)
13 def test_bitbakelayers_showcrossdepends(self): 11 def test_bitbakelayers_showcrossdepends(self):
14 result = runCmd('bitbake-layers show-cross-depends') 12 result = runCmd('bitbake-layers show-cross-depends')
15 self.assertTrue('aspell' in result.output, msg = "No dependencies were shown. bitbake-layers show-cross-depends output: %s" % result.output) 13 self.assertTrue('aspell' in result.output, msg = "No dependencies were shown. bitbake-layers show-cross-depends output: %s" % result.output)
16 14
17 @OETestID(83)
18 def test_bitbakelayers_showlayers(self): 15 def test_bitbakelayers_showlayers(self):
19 result = runCmd('bitbake-layers show-layers') 16 result = runCmd('bitbake-layers show-layers')
20 self.assertTrue('meta-selftest' in result.output, msg = "No layers were shown. bitbake-layers show-layers output: %s" % result.output) 17 self.assertTrue('meta-selftest' in result.output, msg = "No layers were shown. bitbake-layers show-layers output: %s" % result.output)
21 18
22 @OETestID(93)
23 def test_bitbakelayers_showappends(self): 19 def test_bitbakelayers_showappends(self):
24 recipe = "xcursor-transparent-theme" 20 recipe = "xcursor-transparent-theme"
25 bb_file = self.get_recipe_basename(recipe) 21 bb_file = self.get_recipe_basename(recipe)
26 result = runCmd('bitbake-layers show-appends') 22 result = runCmd('bitbake-layers show-appends')
27 self.assertTrue(bb_file in result.output, msg="%s file was not recognised. bitbake-layers show-appends output: %s" % (bb_file, result.output)) 23 self.assertTrue(bb_file in result.output, msg="%s file was not recognised. bitbake-layers show-appends output: %s" % (bb_file, result.output))
28 24
29 @OETestID(90)
30 def test_bitbakelayers_showoverlayed(self): 25 def test_bitbakelayers_showoverlayed(self):
31 result = runCmd('bitbake-layers show-overlayed') 26 result = runCmd('bitbake-layers show-overlayed')
32 self.assertTrue('aspell' in result.output, msg="aspell overlayed recipe was not recognised bitbake-layers show-overlayed %s" % result.output) 27 self.assertTrue('aspell' in result.output, msg="aspell overlayed recipe was not recognised bitbake-layers show-overlayed %s" % result.output)
33 28
34 @OETestID(95)
35 def test_bitbakelayers_flatten(self): 29 def test_bitbakelayers_flatten(self):
36 recipe = "xcursor-transparent-theme" 30 recipe = "xcursor-transparent-theme"
37 recipe_path = "recipes-graphics/xcursor-transparent-theme" 31 recipe_path = "recipes-graphics/xcursor-transparent-theme"
@@ -46,7 +40,6 @@ class BitbakeLayers(OESelftestTestCase):
46 find_in_contents = re.search("##### bbappended from meta-selftest #####\n(.*\n)*include test_recipe.inc", contents) 40 find_in_contents = re.search("##### bbappended from meta-selftest #####\n(.*\n)*include test_recipe.inc", contents)
47 self.assertTrue(find_in_contents, msg = "Flattening layers did not work. bitbake-layers flatten output: %s" % result.output) 41 self.assertTrue(find_in_contents, msg = "Flattening layers did not work. bitbake-layers flatten output: %s" % result.output)
48 42
49 @OETestID(1195)
50 def test_bitbakelayers_add_remove(self): 43 def test_bitbakelayers_add_remove(self):
51 test_layer = os.path.join(get_bb_var('COREBASE'), 'meta-skeleton') 44 test_layer = os.path.join(get_bb_var('COREBASE'), 'meta-skeleton')
52 result = runCmd('bitbake-layers show-layers') 45 result = runCmd('bitbake-layers show-layers')
@@ -64,7 +57,6 @@ class BitbakeLayers(OESelftestTestCase):
64 result = runCmd('bitbake-layers show-layers') 57 result = runCmd('bitbake-layers show-layers')
65 self.assertNotIn('meta-skeleton', result.output, msg = "meta-skeleton should have been removed at this step. bitbake-layers show-layers output: %s" % result.output) 58 self.assertNotIn('meta-skeleton', result.output, msg = "meta-skeleton should have been removed at this step. bitbake-layers show-layers output: %s" % result.output)
66 59
67 @OETestID(1384)
68 def test_bitbakelayers_showrecipes(self): 60 def test_bitbakelayers_showrecipes(self):
69 result = runCmd('bitbake-layers show-recipes') 61 result = runCmd('bitbake-layers show-recipes')
70 self.assertIn('aspell:', result.output) 62 self.assertIn('aspell:', result.output)
diff --git a/meta/lib/oeqa/selftest/cases/bbtests.py b/meta/lib/oeqa/selftest/cases/bbtests.py
index c503e4eedd..1b83741974 100644
--- a/meta/lib/oeqa/selftest/cases/bbtests.py
+++ b/meta/lib/oeqa/selftest/cases/bbtests.py
@@ -5,7 +5,6 @@ import oeqa.utils.ftools as ftools
5from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars 5from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars
6 6
7from oeqa.selftest.case import OESelftestTestCase 7from oeqa.selftest.case import OESelftestTestCase
8from oeqa.core.decorator.oeid import OETestID
9 8
10class BitbakeTests(OESelftestTestCase): 9class BitbakeTests(OESelftestTestCase):
11 10
@@ -14,13 +13,11 @@ class BitbakeTests(OESelftestTestCase):
14 if line in l: 13 if line in l:
15 return l 14 return l
16 15
17 @OETestID(789)
18 # Test bitbake can run from the <builddir>/conf directory 16 # Test bitbake can run from the <builddir>/conf directory
19 def test_run_bitbake_from_dir_1(self): 17 def test_run_bitbake_from_dir_1(self):
20 os.chdir(os.path.join(self.builddir, 'conf')) 18 os.chdir(os.path.join(self.builddir, 'conf'))
21 self.assertEqual(bitbake('-e').status, 0, msg = "bitbake couldn't run from \"conf\" dir") 19 self.assertEqual(bitbake('-e').status, 0, msg = "bitbake couldn't run from \"conf\" dir")
22 20
23 @OETestID(790)
24 # Test bitbake can run from the <builddir>'s parent directory 21 # Test bitbake can run from the <builddir>'s parent directory
25 def test_run_bitbake_from_dir_2(self): 22 def test_run_bitbake_from_dir_2(self):
26 my_env = os.environ.copy() 23 my_env = os.environ.copy()
@@ -36,7 +33,6 @@ class BitbakeTests(OESelftestTestCase):
36 self.assertEqual(bitbake('-e', env=my_env).status, 0, msg = "bitbake couldn't run from /tmp/") 33 self.assertEqual(bitbake('-e', env=my_env).status, 0, msg = "bitbake couldn't run from /tmp/")
37 34
38 35
39 @OETestID(806)
40 def test_event_handler(self): 36 def test_event_handler(self):
41 self.write_config("INHERIT += \"test_events\"") 37 self.write_config("INHERIT += \"test_events\"")
42 result = bitbake('m4-native') 38 result = bitbake('m4-native')
@@ -46,7 +42,6 @@ class BitbakeTests(OESelftestTestCase):
46 self.assertTrue(find_build_completed, msg = "Match failed in:\n%s" % result.output) 42 self.assertTrue(find_build_completed, msg = "Match failed in:\n%s" % result.output)
47 self.assertFalse('Test for bb.event.InvalidEvent' in result.output, msg = "\"Test for bb.event.InvalidEvent\" message found during bitbake process. bitbake output: %s" % result.output) 43 self.assertFalse('Test for bb.event.InvalidEvent' in result.output, msg = "\"Test for bb.event.InvalidEvent\" message found during bitbake process. bitbake output: %s" % result.output)
48 44
49 @OETestID(103)
50 def test_local_sstate(self): 45 def test_local_sstate(self):
51 bitbake('m4-native') 46 bitbake('m4-native')
52 bitbake('m4-native -cclean') 47 bitbake('m4-native -cclean')
@@ -54,17 +49,14 @@ class BitbakeTests(OESelftestTestCase):
54 find_setscene = re.search("m4-native.*do_.*_setscene", result.output) 49 find_setscene = re.search("m4-native.*do_.*_setscene", result.output)
55 self.assertTrue(find_setscene, msg = "No \"m4-native.*do_.*_setscene\" message found during bitbake m4-native. bitbake output: %s" % result.output ) 50 self.assertTrue(find_setscene, msg = "No \"m4-native.*do_.*_setscene\" message found during bitbake m4-native. bitbake output: %s" % result.output )
56 51
57 @OETestID(105)
58 def test_bitbake_invalid_recipe(self): 52 def test_bitbake_invalid_recipe(self):
59 result = bitbake('-b asdf', ignore_status=True) 53 result = bitbake('-b asdf', ignore_status=True)
60 self.assertTrue("ERROR: Unable to find any recipe file matching 'asdf'" in result.output, msg = "Though asdf recipe doesn't exist, bitbake didn't output any err. message. bitbake output: %s" % result.output) 54 self.assertTrue("ERROR: Unable to find any recipe file matching 'asdf'" in result.output, msg = "Though asdf recipe doesn't exist, bitbake didn't output any err. message. bitbake output: %s" % result.output)
61 55
62 @OETestID(107)
63 def test_bitbake_invalid_target(self): 56 def test_bitbake_invalid_target(self):
64 result = bitbake('asdf', ignore_status=True) 57 result = bitbake('asdf', ignore_status=True)
65 self.assertTrue("ERROR: Nothing PROVIDES 'asdf'" in result.output, msg = "Though no 'asdf' target exists, bitbake didn't output any err. message. bitbake output: %s" % result.output) 58 self.assertTrue("ERROR: Nothing PROVIDES 'asdf'" in result.output, msg = "Though no 'asdf' target exists, bitbake didn't output any err. message. bitbake output: %s" % result.output)
66 59
67 @OETestID(106)
68 def test_warnings_errors(self): 60 def test_warnings_errors(self):
69 result = bitbake('-b asdf', ignore_status=True) 61 result = bitbake('-b asdf', ignore_status=True)
70 find_warnings = re.search("Summary: There w.{2,3}? [1-9][0-9]* WARNING messages* shown", result.output) 62 find_warnings = re.search("Summary: There w.{2,3}? [1-9][0-9]* WARNING messages* shown", result.output)
@@ -72,7 +64,6 @@ class BitbakeTests(OESelftestTestCase):
72 self.assertTrue(find_warnings, msg="Did not find the mumber of warnings at the end of the build:\n" + result.output) 64 self.assertTrue(find_warnings, msg="Did not find the mumber of warnings at the end of the build:\n" + result.output)
73 self.assertTrue(find_errors, msg="Did not find the mumber of errors at the end of the build:\n" + result.output) 65 self.assertTrue(find_errors, msg="Did not find the mumber of errors at the end of the build:\n" + result.output)
74 66
75 @OETestID(108)
76 def test_invalid_patch(self): 67 def test_invalid_patch(self):
77 # This patch should fail to apply. 68 # This patch should fail to apply.
78 self.write_recipeinc('man-db', 'FILESEXTRAPATHS_prepend := "${THISDIR}/files:"\nSRC_URI += "file://0001-Test-patch-here.patch"') 69 self.write_recipeinc('man-db', 'FILESEXTRAPATHS_prepend := "${THISDIR}/files:"\nSRC_URI += "file://0001-Test-patch-here.patch"')
@@ -83,7 +74,6 @@ class BitbakeTests(OESelftestTestCase):
83 line = self.getline(result, "Function failed: patch_do_patch") 74 line = self.getline(result, "Function failed: patch_do_patch")
84 self.assertTrue(line and line.startswith("ERROR:"), msg = "Incorrectly formed patch application didn't fail. bitbake output: %s" % result.output) 75 self.assertTrue(line and line.startswith("ERROR:"), msg = "Incorrectly formed patch application didn't fail. bitbake output: %s" % result.output)
85 76
86 @OETestID(1354)
87 def test_force_task_1(self): 77 def test_force_task_1(self):
88 # test 1 from bug 5875 78 # test 1 from bug 5875
89 test_recipe = 'zlib' 79 test_recipe = 'zlib'
@@ -108,7 +98,6 @@ class BitbakeTests(OESelftestTestCase):
108 ret = bitbake(test_recipe) 98 ret = bitbake(test_recipe)
109 self.assertIn('task do_package_write_rpm:', ret.output, 'Task do_package_write_rpm did not re-executed.') 99 self.assertIn('task do_package_write_rpm:', ret.output, 'Task do_package_write_rpm did not re-executed.')
110 100
111 @OETestID(163)
112 def test_force_task_2(self): 101 def test_force_task_2(self):
113 # test 2 from bug 5875 102 # test 2 from bug 5875
114 test_recipe = 'zlib' 103 test_recipe = 'zlib'
@@ -121,7 +110,6 @@ class BitbakeTests(OESelftestTestCase):
121 for task in look_for_tasks: 110 for task in look_for_tasks:
122 self.assertIn(task, result.output, msg="Couldn't find %s task.") 111 self.assertIn(task, result.output, msg="Couldn't find %s task.")
123 112
124 @OETestID(167)
125 def test_bitbake_g(self): 113 def test_bitbake_g(self):
126 result = bitbake('-g core-image-minimal') 114 result = bitbake('-g core-image-minimal')
127 for f in ['pn-buildlist', 'recipe-depends.dot', 'task-depends.dot']: 115 for f in ['pn-buildlist', 'recipe-depends.dot', 'task-depends.dot']:
@@ -129,7 +117,6 @@ class BitbakeTests(OESelftestTestCase):
129 self.assertTrue('Task dependencies saved to \'task-depends.dot\'' in result.output, msg = "No task dependency \"task-depends.dot\" file was generated for the given task target. bitbake output: %s" % result.output) 117 self.assertTrue('Task dependencies saved to \'task-depends.dot\'' in result.output, msg = "No task dependency \"task-depends.dot\" file was generated for the given task target. bitbake output: %s" % result.output)
130 self.assertTrue('busybox' in ftools.read_file(os.path.join(self.builddir, 'task-depends.dot')), msg = "No \"busybox\" dependency found in task-depends.dot file.") 118 self.assertTrue('busybox' in ftools.read_file(os.path.join(self.builddir, 'task-depends.dot')), msg = "No \"busybox\" dependency found in task-depends.dot file.")
131 119
132 @OETestID(899)
133 def test_image_manifest(self): 120 def test_image_manifest(self):
134 bitbake('core-image-minimal') 121 bitbake('core-image-minimal')
135 bb_vars = get_bb_vars(["DEPLOY_DIR_IMAGE", "IMAGE_LINK_NAME"], "core-image-minimal") 122 bb_vars = get_bb_vars(["DEPLOY_DIR_IMAGE", "IMAGE_LINK_NAME"], "core-image-minimal")
@@ -138,7 +125,6 @@ class BitbakeTests(OESelftestTestCase):
138 manifest = os.path.join(deploydir, imagename + ".manifest") 125 manifest = os.path.join(deploydir, imagename + ".manifest")
139 self.assertTrue(os.path.islink(manifest), msg="No manifest file created for image. It should have been created in %s" % manifest) 126 self.assertTrue(os.path.islink(manifest), msg="No manifest file created for image. It should have been created in %s" % manifest)
140 127
141 @OETestID(168)
142 def test_invalid_recipe_src_uri(self): 128 def test_invalid_recipe_src_uri(self):
143 data = 'SRC_URI = "file://invalid"' 129 data = 'SRC_URI = "file://invalid"'
144 self.write_recipeinc('man-db', data) 130 self.write_recipeinc('man-db', data)
@@ -159,7 +145,6 @@ doesn't exist, yet no error message encountered. bitbake output: %s" % result.ou
159 self.assertTrue(line and line.startswith("ERROR:"), msg = "\"invalid\" file \ 145 self.assertTrue(line and line.startswith("ERROR:"), msg = "\"invalid\" file \
160doesn't exist, yet fetcher didn't report any error. bitbake output: %s" % result.output) 146doesn't exist, yet fetcher didn't report any error. bitbake output: %s" % result.output)
161 147
162 @OETestID(171)
163 def test_rename_downloaded_file(self): 148 def test_rename_downloaded_file(self):
164 # TODO unique dldir instead of using cleanall 149 # TODO unique dldir instead of using cleanall
165 # TODO: need to set sstatedir? 150 # TODO: need to set sstatedir?
@@ -177,29 +162,24 @@ SSTATE_DIR = \"${TOPDIR}/download-selftest\"
177 self.assertTrue(os.path.isfile(os.path.join(dl_dir, 'test-aspell.tar.gz')), msg = "File rename failed. No corresponding test-aspell.tar.gz file found under %s" % dl_dir) 162 self.assertTrue(os.path.isfile(os.path.join(dl_dir, 'test-aspell.tar.gz')), msg = "File rename failed. No corresponding test-aspell.tar.gz file found under %s" % dl_dir)
178 self.assertTrue(os.path.isfile(os.path.join(dl_dir, 'test-aspell.tar.gz.done')), "File rename failed. No corresponding test-aspell.tar.gz.done file found under %s" % dl_dir) 163 self.assertTrue(os.path.isfile(os.path.join(dl_dir, 'test-aspell.tar.gz.done')), "File rename failed. No corresponding test-aspell.tar.gz.done file found under %s" % dl_dir)
179 164
180 @OETestID(1028)
181 def test_environment(self): 165 def test_environment(self):
182 self.write_config("TEST_ENV=\"localconf\"") 166 self.write_config("TEST_ENV=\"localconf\"")
183 result = runCmd('bitbake -e | grep TEST_ENV=') 167 result = runCmd('bitbake -e | grep TEST_ENV=')
184 self.assertTrue('localconf' in result.output, msg = "bitbake didn't report any value for TEST_ENV variable. To test, run 'bitbake -e | grep TEST_ENV='") 168 self.assertTrue('localconf' in result.output, msg = "bitbake didn't report any value for TEST_ENV variable. To test, run 'bitbake -e | grep TEST_ENV='")
185 169
186 @OETestID(1029)
187 def test_dry_run(self): 170 def test_dry_run(self):
188 result = runCmd('bitbake -n m4-native') 171 result = runCmd('bitbake -n m4-native')
189 self.assertEqual(0, result.status, "bitbake dry run didn't run as expected. %s" % result.output) 172 self.assertEqual(0, result.status, "bitbake dry run didn't run as expected. %s" % result.output)
190 173
191 @OETestID(1030)
192 def test_just_parse(self): 174 def test_just_parse(self):
193 result = runCmd('bitbake -p') 175 result = runCmd('bitbake -p')
194 self.assertEqual(0, result.status, "errors encountered when parsing recipes. %s" % result.output) 176 self.assertEqual(0, result.status, "errors encountered when parsing recipes. %s" % result.output)
195 177
196 @OETestID(1031)
197 def test_version(self): 178 def test_version(self):
198 result = runCmd('bitbake -s | grep wget') 179 result = runCmd('bitbake -s | grep wget')
199 find = re.search(r"wget *:([0-9a-zA-Z\.\-]+)", result.output) 180 find = re.search(r"wget *:([0-9a-zA-Z\.\-]+)", result.output)
200 self.assertTrue(find, "No version returned for searched recipe. bitbake output: %s" % result.output) 181 self.assertTrue(find, "No version returned for searched recipe. bitbake output: %s" % result.output)
201 182
202 @OETestID(1032)
203 def test_prefile(self): 183 def test_prefile(self):
204 preconf = os.path.join(self.builddir, 'conf/prefile.conf') 184 preconf = os.path.join(self.builddir, 'conf/prefile.conf')
205 self.track_for_cleanup(preconf) 185 self.track_for_cleanup(preconf)
@@ -210,7 +190,6 @@ SSTATE_DIR = \"${TOPDIR}/download-selftest\"
210 result = runCmd('bitbake -r conf/prefile.conf -e | grep TEST_PREFILE=') 190 result = runCmd('bitbake -r conf/prefile.conf -e | grep TEST_PREFILE=')
211 self.assertTrue('localconf' in result.output, "Preconfigure file \"prefile.conf\"was not taken into consideration.") 191 self.assertTrue('localconf' in result.output, "Preconfigure file \"prefile.conf\"was not taken into consideration.")
212 192
213 @OETestID(1033)
214 def test_postfile(self): 193 def test_postfile(self):
215 postconf = os.path.join(self.builddir, 'conf/postfile.conf') 194 postconf = os.path.join(self.builddir, 'conf/postfile.conf')
216 self.track_for_cleanup(postconf) 195 self.track_for_cleanup(postconf)
@@ -219,12 +198,10 @@ SSTATE_DIR = \"${TOPDIR}/download-selftest\"
219 result = runCmd('bitbake -R conf/postfile.conf -e | grep TEST_POSTFILE=') 198 result = runCmd('bitbake -R conf/postfile.conf -e | grep TEST_POSTFILE=')
220 self.assertTrue('postfile' in result.output, "Postconfigure file \"postfile.conf\"was not taken into consideration.") 199 self.assertTrue('postfile' in result.output, "Postconfigure file \"postfile.conf\"was not taken into consideration.")
221 200
222 @OETestID(1034)
223 def test_checkuri(self): 201 def test_checkuri(self):
224 result = runCmd('bitbake -c checkuri m4') 202 result = runCmd('bitbake -c checkuri m4')
225 self.assertEqual(0, result.status, msg = "\"checkuri\" task was not executed. bitbake output: %s" % result.output) 203 self.assertEqual(0, result.status, msg = "\"checkuri\" task was not executed. bitbake output: %s" % result.output)
226 204
227 @OETestID(1035)
228 def test_continue(self): 205 def test_continue(self):
229 self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\" 206 self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\"
230SSTATE_DIR = \"${TOPDIR}/download-selftest\" 207SSTATE_DIR = \"${TOPDIR}/download-selftest\"
@@ -239,7 +216,6 @@ INHERIT_remove = \"report-error\"
239 continuepos = result.output.find('NOTE: recipe xcursor-transparent-theme-%s: task do_unpack: Started' % manver.group(1)) 216 continuepos = result.output.find('NOTE: recipe xcursor-transparent-theme-%s: task do_unpack: Started' % manver.group(1))
240 self.assertLess(errorpos,continuepos, msg = "bitbake didn't pass do_fail_task. bitbake output: %s" % result.output) 217 self.assertLess(errorpos,continuepos, msg = "bitbake didn't pass do_fail_task. bitbake output: %s" % result.output)
241 218
242 @OETestID(1119)
243 def test_non_gplv3(self): 219 def test_non_gplv3(self):
244 self.write_config('INCOMPATIBLE_LICENSE = "GPLv3"') 220 self.write_config('INCOMPATIBLE_LICENSE = "GPLv3"')
245 result = bitbake('selftest-ed', ignore_status=True) 221 result = bitbake('selftest-ed', ignore_status=True)
@@ -248,7 +224,6 @@ INHERIT_remove = \"report-error\"
248 self.assertFalse(os.path.isfile(os.path.join(lic_dir, 'selftest-ed/generic_GPLv3'))) 224 self.assertFalse(os.path.isfile(os.path.join(lic_dir, 'selftest-ed/generic_GPLv3')))
249 self.assertTrue(os.path.isfile(os.path.join(lic_dir, 'selftest-ed/generic_GPLv2'))) 225 self.assertTrue(os.path.isfile(os.path.join(lic_dir, 'selftest-ed/generic_GPLv2')))
250 226
251 @OETestID(1422)
252 def test_setscene_only(self): 227 def test_setscene_only(self):
253 """ Bitbake option to restore from sstate only within a build (i.e. execute no real tasks, only setscene)""" 228 """ Bitbake option to restore from sstate only within a build (i.e. execute no real tasks, only setscene)"""
254 test_recipe = 'ed' 229 test_recipe = 'ed'
@@ -263,7 +238,6 @@ INHERIT_remove = \"report-error\"
263 self.assertIn('_setscene', task, 'A task different from _setscene ran: %s.\n' 238 self.assertIn('_setscene', task, 'A task different from _setscene ran: %s.\n'
264 'Executed tasks were: %s' % (task, str(tasks))) 239 'Executed tasks were: %s' % (task, str(tasks)))
265 240
266 @OETestID(1425)
267 def test_bbappend_order(self): 241 def test_bbappend_order(self):
268 """ Bitbake should bbappend to recipe in a predictable order """ 242 """ Bitbake should bbappend to recipe in a predictable order """
269 test_recipe = 'ed' 243 test_recipe = 'ed'
diff --git a/meta/lib/oeqa/selftest/cases/buildoptions.py b/meta/lib/oeqa/selftest/cases/buildoptions.py
index 6a18eb8366..953c6e468d 100644
--- a/meta/lib/oeqa/selftest/cases/buildoptions.py
+++ b/meta/lib/oeqa/selftest/cases/buildoptions.py
@@ -7,11 +7,9 @@ from oeqa.selftest.case import OESelftestTestCase
7from oeqa.selftest.cases.buildhistory import BuildhistoryBase 7from oeqa.selftest.cases.buildhistory import BuildhistoryBase
8from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars 8from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars
9import oeqa.utils.ftools as ftools 9import oeqa.utils.ftools as ftools
10from oeqa.core.decorator.oeid import OETestID
11 10
12class ImageOptionsTests(OESelftestTestCase): 11class ImageOptionsTests(OESelftestTestCase):
13 12
14 @OETestID(761)
15 def test_incremental_image_generation(self): 13 def test_incremental_image_generation(self):
16 image_pkgtype = get_bb_var("IMAGE_PKGTYPE") 14 image_pkgtype = get_bb_var("IMAGE_PKGTYPE")
17 if image_pkgtype != 'rpm': 15 if image_pkgtype != 'rpm':
@@ -30,7 +28,6 @@ class ImageOptionsTests(OESelftestTestCase):
30 incremental_removed = re.search(r"Erasing\s*:\s*packagegroup-core-ssh-openssh", log_data_removed) 28 incremental_removed = re.search(r"Erasing\s*:\s*packagegroup-core-ssh-openssh", log_data_removed)
31 self.assertTrue(incremental_removed, msg = "Match failed in:\n%s" % log_data_removed) 29 self.assertTrue(incremental_removed, msg = "Match failed in:\n%s" % log_data_removed)
32 30
33 @OETestID(286)
34 def test_ccache_tool(self): 31 def test_ccache_tool(self):
35 bitbake("ccache-native") 32 bitbake("ccache-native")
36 bb_vars = get_bb_vars(['SYSROOT_DESTDIR', 'bindir'], 'ccache-native') 33 bb_vars = get_bb_vars(['SYSROOT_DESTDIR', 'bindir'], 'ccache-native')
@@ -45,7 +42,6 @@ class ImageOptionsTests(OESelftestTestCase):
45 loglines = "".join(f.readlines()) 42 loglines = "".join(f.readlines())
46 self.assertIn("ccache", loglines, msg="No match for ccache in m4-native log.do_compile. For further details: %s" % log_compile) 43 self.assertIn("ccache", loglines, msg="No match for ccache in m4-native log.do_compile. For further details: %s" % log_compile)
47 44
48 @OETestID(1435)
49 def test_read_only_image(self): 45 def test_read_only_image(self):
50 distro_features = get_bb_var('DISTRO_FEATURES') 46 distro_features = get_bb_var('DISTRO_FEATURES')
51 if not ('x11' in distro_features and 'opengl' in distro_features): 47 if not ('x11' in distro_features and 'opengl' in distro_features):
@@ -56,7 +52,6 @@ class ImageOptionsTests(OESelftestTestCase):
56 52
57class DiskMonTest(OESelftestTestCase): 53class DiskMonTest(OESelftestTestCase):
58 54
59 @OETestID(277)
60 def test_stoptask_behavior(self): 55 def test_stoptask_behavior(self):
61 self.write_config('BB_DISKMON_DIRS = "STOPTASKS,${TMPDIR},100000G,100K"') 56 self.write_config('BB_DISKMON_DIRS = "STOPTASKS,${TMPDIR},100000G,100K"')
62 res = bitbake("delay -c delay", ignore_status = True) 57 res = bitbake("delay -c delay", ignore_status = True)
@@ -76,7 +71,6 @@ class SanityOptionsTest(OESelftestTestCase):
76 if line in l: 71 if line in l:
77 return l 72 return l
78 73
79 @OETestID(927)
80 def test_options_warnqa_errorqa_switch(self): 74 def test_options_warnqa_errorqa_switch(self):
81 75
82 self.write_config("INHERIT_remove = \"report-error\"") 76 self.write_config("INHERIT_remove = \"report-error\"")
@@ -98,7 +92,6 @@ class SanityOptionsTest(OESelftestTestCase):
98 line = self.getline(res, "QA Issue: xcursor-transparent-theme-dbg is listed in PACKAGES multiple times, this leads to packaging errors.") 92 line = self.getline(res, "QA Issue: xcursor-transparent-theme-dbg is listed in PACKAGES multiple times, this leads to packaging errors.")
99 self.assertTrue(line and line.startswith("WARNING:"), msg=res.output) 93 self.assertTrue(line and line.startswith("WARNING:"), msg=res.output)
100 94
101 @OETestID(1421)
102 def test_layer_without_git_dir(self): 95 def test_layer_without_git_dir(self):
103 """ 96 """
104 Summary: Test that layer git revisions are displayed and do not fail without git repository 97 Summary: Test that layer git revisions are displayed and do not fail without git repository
@@ -140,12 +133,10 @@ class SanityOptionsTest(OESelftestTestCase):
140 133
141class BuildhistoryTests(BuildhistoryBase): 134class BuildhistoryTests(BuildhistoryBase):
142 135
143 @OETestID(293)
144 def test_buildhistory_basic(self): 136 def test_buildhistory_basic(self):
145 self.run_buildhistory_operation('xcursor-transparent-theme') 137 self.run_buildhistory_operation('xcursor-transparent-theme')
146 self.assertTrue(os.path.isdir(get_bb_var('BUILDHISTORY_DIR')), "buildhistory dir was not created.") 138 self.assertTrue(os.path.isdir(get_bb_var('BUILDHISTORY_DIR')), "buildhistory dir was not created.")
147 139
148 @OETestID(294)
149 def test_buildhistory_buildtime_pr_backwards(self): 140 def test_buildhistory_buildtime_pr_backwards(self):
150 target = 'xcursor-transparent-theme' 141 target = 'xcursor-transparent-theme'
151 error = "ERROR:.*QA Issue: Package version for package %s went backwards which would break package feeds from (.*-r1.* to .*-r0.*)" % target 142 error = "ERROR:.*QA Issue: Package version for package %s went backwards which would break package feeds from (.*-r1.* to .*-r0.*)" % target
@@ -153,7 +144,6 @@ class BuildhistoryTests(BuildhistoryBase):
153 self.run_buildhistory_operation(target, target_config="PR = \"r0\"", change_bh_location=False, expect_error=True, error_regex=error) 144 self.run_buildhistory_operation(target, target_config="PR = \"r0\"", change_bh_location=False, expect_error=True, error_regex=error)
154 145
155class ArchiverTest(OESelftestTestCase): 146class ArchiverTest(OESelftestTestCase):
156 @OETestID(926)
157 def test_arch_work_dir_and_export_source(self): 147 def test_arch_work_dir_and_export_source(self):
158 """ 148 """
159 Test for archiving the work directory and exporting the source files. 149 Test for archiving the work directory and exporting the source files.
diff --git a/meta/lib/oeqa/selftest/cases/containerimage.py b/meta/lib/oeqa/selftest/cases/containerimage.py
index 8deaae75d8..47d97b7541 100644
--- a/meta/lib/oeqa/selftest/cases/containerimage.py
+++ b/meta/lib/oeqa/selftest/cases/containerimage.py
@@ -2,7 +2,6 @@ import os
2 2
3from oeqa.selftest.case import OESelftestTestCase 3from oeqa.selftest.case import OESelftestTestCase
4from oeqa.utils.commands import bitbake, get_bb_vars, runCmd 4from oeqa.utils.commands import bitbake, get_bb_vars, runCmd
5from oeqa.core.decorator.oeid import OETestID
6 5
7# This test builds an image with using the "container" IMAGE_FSTYPE, and 6# This test builds an image with using the "container" IMAGE_FSTYPE, and
8# ensures that then files in the image are only the ones expected. 7# ensures that then files in the image are only the ones expected.
@@ -21,7 +20,6 @@ class ContainerImageTests(OESelftestTestCase):
21 20
22 # Verify that when specifying a IMAGE_TYPEDEP_ of the form "foo.bar" that 21 # Verify that when specifying a IMAGE_TYPEDEP_ of the form "foo.bar" that
23 # the conversion type bar gets added as a dep as well 22 # the conversion type bar gets added as a dep as well
24 @OETestID(1619)
25 def test_expected_files(self): 23 def test_expected_files(self):
26 24
27 def get_each_path_part(path): 25 def get_each_path_part(path):
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index 58f3e58461..48fc042904 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -9,7 +9,6 @@ import oeqa.utils.ftools as ftools
9from oeqa.selftest.case import OESelftestTestCase 9from oeqa.selftest.case import OESelftestTestCase
10from oeqa.utils.commands import runCmd, bitbake, get_bb_var, create_temp_layer 10from oeqa.utils.commands import runCmd, bitbake, get_bb_var, create_temp_layer
11from oeqa.utils.commands import get_bb_vars, runqemu, get_test_layer 11from oeqa.utils.commands import get_bb_vars, runqemu, get_test_layer
12from oeqa.core.decorator.oeid import OETestID
13 12
14oldmetapath = None 13oldmetapath = None
15 14
@@ -233,7 +232,6 @@ class DevtoolBase(OESelftestTestCase):
233 232
234class DevtoolTests(DevtoolBase): 233class DevtoolTests(DevtoolBase):
235 234
236 @OETestID(1158)
237 def test_create_workspace(self): 235 def test_create_workspace(self):
238 # Check preconditions 236 # Check preconditions
239 result = runCmd('bitbake-layers show-layers') 237 result = runCmd('bitbake-layers show-layers')
@@ -256,7 +254,6 @@ class DevtoolTests(DevtoolBase):
256 254
257class DevtoolAddTests(DevtoolBase): 255class DevtoolAddTests(DevtoolBase):
258 256
259 @OETestID(1159)
260 def test_devtool_add(self): 257 def test_devtool_add(self):
261 # Fetch source 258 # Fetch source
262 tempdir = tempfile.mkdtemp(prefix='devtoolqa') 259 tempdir = tempfile.mkdtemp(prefix='devtoolqa')
@@ -298,7 +295,6 @@ class DevtoolAddTests(DevtoolBase):
298 bindir = bindir[1:] 295 bindir = bindir[1:]
299 self.assertTrue(os.path.isfile(os.path.join(installdir, bindir, 'pv')), 'pv binary not found in D') 296 self.assertTrue(os.path.isfile(os.path.join(installdir, bindir, 'pv')), 'pv binary not found in D')
300 297
301 @OETestID(1423)
302 def test_devtool_add_git_local(self): 298 def test_devtool_add_git_local(self):
303 # We need dbus built so that DEPENDS recognition works 299 # We need dbus built so that DEPENDS recognition works
304 bitbake('dbus') 300 bitbake('dbus')
@@ -340,7 +336,6 @@ class DevtoolAddTests(DevtoolBase):
340 checkvars['DEPENDS'] = set(['dbus']) 336 checkvars['DEPENDS'] = set(['dbus'])
341 self._test_recipe_contents(recipefile, checkvars, []) 337 self._test_recipe_contents(recipefile, checkvars, [])
342 338
343 @OETestID(1162)
344 def test_devtool_add_library(self): 339 def test_devtool_add_library(self):
345 # Fetch source 340 # Fetch source
346 tempdir = tempfile.mkdtemp(prefix='devtoolqa') 341 tempdir = tempfile.mkdtemp(prefix='devtoolqa')
@@ -389,7 +384,6 @@ class DevtoolAddTests(DevtoolBase):
389 self.assertFalse(matches, 'Stamp files exist for recipe libftdi that should have been cleaned') 384 self.assertFalse(matches, 'Stamp files exist for recipe libftdi that should have been cleaned')
390 self.assertFalse(os.path.isfile(os.path.join(staging_libdir, 'libftdi1.so.2.1.0')), 'libftdi binary still found in STAGING_LIBDIR after cleaning') 385 self.assertFalse(os.path.isfile(os.path.join(staging_libdir, 'libftdi1.so.2.1.0')), 'libftdi binary still found in STAGING_LIBDIR after cleaning')
391 386
392 @OETestID(1160)
393 def test_devtool_add_fetch(self): 387 def test_devtool_add_fetch(self):
394 # Fetch source 388 # Fetch source
395 tempdir = tempfile.mkdtemp(prefix='devtoolqa') 389 tempdir = tempfile.mkdtemp(prefix='devtoolqa')
@@ -435,7 +429,6 @@ class DevtoolAddTests(DevtoolBase):
435 checkvars['SRC_URI'] = url 429 checkvars['SRC_URI'] = url
436 self._test_recipe_contents(recipefile, checkvars, []) 430 self._test_recipe_contents(recipefile, checkvars, [])
437 431
438 @OETestID(1161)
439 def test_devtool_add_fetch_git(self): 432 def test_devtool_add_fetch_git(self):
440 tempdir = tempfile.mkdtemp(prefix='devtoolqa') 433 tempdir = tempfile.mkdtemp(prefix='devtoolqa')
441 self.track_for_cleanup(tempdir) 434 self.track_for_cleanup(tempdir)
@@ -483,7 +476,6 @@ class DevtoolAddTests(DevtoolBase):
483 checkvars['SRCREV'] = checkrev 476 checkvars['SRCREV'] = checkrev
484 self._test_recipe_contents(recipefile, checkvars, []) 477 self._test_recipe_contents(recipefile, checkvars, [])
485 478
486 @OETestID(1391)
487 def test_devtool_add_fetch_simple(self): 479 def test_devtool_add_fetch_simple(self):
488 # Fetch source from a remote URL, auto-detecting name 480 # Fetch source from a remote URL, auto-detecting name
489 tempdir = tempfile.mkdtemp(prefix='devtoolqa') 481 tempdir = tempfile.mkdtemp(prefix='devtoolqa')
@@ -513,7 +505,6 @@ class DevtoolAddTests(DevtoolBase):
513 505
514class DevtoolModifyTests(DevtoolBase): 506class DevtoolModifyTests(DevtoolBase):
515 507
516 @OETestID(1164)
517 def test_devtool_modify(self): 508 def test_devtool_modify(self):
518 import oe.path 509 import oe.path
519 510
@@ -571,7 +562,6 @@ class DevtoolModifyTests(DevtoolBase):
571 result = runCmd('devtool status') 562 result = runCmd('devtool status')
572 self.assertNotIn('mdadm', result.output) 563 self.assertNotIn('mdadm', result.output)
573 564
574 @OETestID(1620)
575 def test_devtool_buildclean(self): 565 def test_devtool_buildclean(self):
576 def assertFile(path, *paths): 566 def assertFile(path, *paths):
577 f = os.path.join(path, *paths) 567 f = os.path.join(path, *paths)
@@ -618,7 +608,6 @@ class DevtoolModifyTests(DevtoolBase):
618 finally: 608 finally:
619 self.delete_recipeinc('m4') 609 self.delete_recipeinc('m4')
620 610
621 @OETestID(1166)
622 def test_devtool_modify_invalid(self): 611 def test_devtool_modify_invalid(self):
623 # Try modifying some recipes 612 # Try modifying some recipes
624 tempdir = tempfile.mkdtemp(prefix='devtoolqa') 613 tempdir = tempfile.mkdtemp(prefix='devtoolqa')
@@ -647,7 +636,6 @@ class DevtoolModifyTests(DevtoolBase):
647 self.assertNotEqual(result.status, 0, 'devtool modify on %s should have failed. devtool output: %s' % (testrecipe, result.output)) 636 self.assertNotEqual(result.status, 0, 'devtool modify on %s should have failed. devtool output: %s' % (testrecipe, result.output))
648 self.assertIn('ERROR: ', result.output, 'devtool modify on %s should have given an ERROR' % testrecipe) 637 self.assertIn('ERROR: ', result.output, 'devtool modify on %s should have given an ERROR' % testrecipe)
649 638
650 @OETestID(1365)
651 def test_devtool_modify_native(self): 639 def test_devtool_modify_native(self):
652 # Check preconditions 640 # Check preconditions
653 self.assertTrue(not os.path.exists(self.workspacedir), 'This test cannot be run with a workspace directory under the build directory') 641 self.assertTrue(not os.path.exists(self.workspacedir), 'This test cannot be run with a workspace directory under the build directory')
@@ -677,7 +665,6 @@ class DevtoolModifyTests(DevtoolBase):
677 self.assertTrue(inheritnative, 'None of these recipes do "inherit native" - need to adjust testrecipes list: %s' % ', '.join(testrecipes)) 665 self.assertTrue(inheritnative, 'None of these recipes do "inherit native" - need to adjust testrecipes list: %s' % ', '.join(testrecipes))
678 666
679 667
680 @OETestID(1165)
681 def test_devtool_modify_git(self): 668 def test_devtool_modify_git(self):
682 # Check preconditions 669 # Check preconditions
683 testrecipe = 'psplash' 670 testrecipe = 'psplash'
@@ -705,7 +692,6 @@ class DevtoolModifyTests(DevtoolBase):
705 # Try building 692 # Try building
706 bitbake(testrecipe) 693 bitbake(testrecipe)
707 694
708 @OETestID(1167)
709 def test_devtool_modify_localfiles(self): 695 def test_devtool_modify_localfiles(self):
710 # Check preconditions 696 # Check preconditions
711 testrecipe = 'lighttpd' 697 testrecipe = 'lighttpd'
@@ -736,7 +722,6 @@ class DevtoolModifyTests(DevtoolBase):
736 # Try building 722 # Try building
737 bitbake(testrecipe) 723 bitbake(testrecipe)
738 724
739 @OETestID(1378)
740 def test_devtool_modify_virtual(self): 725 def test_devtool_modify_virtual(self):
741 # Try modifying a virtual recipe 726 # Try modifying a virtual recipe
742 virtrecipe = 'virtual/make' 727 virtrecipe = 'virtual/make'
@@ -760,7 +745,6 @@ class DevtoolModifyTests(DevtoolBase):
760 745
761class DevtoolUpdateTests(DevtoolBase): 746class DevtoolUpdateTests(DevtoolBase):
762 747
763 @OETestID(1169)
764 def test_devtool_update_recipe(self): 748 def test_devtool_update_recipe(self):
765 # Check preconditions 749 # Check preconditions
766 testrecipe = 'minicom' 750 testrecipe = 'minicom'
@@ -793,7 +777,6 @@ class DevtoolUpdateTests(DevtoolBase):
793 ('??', '.*/0002-Add-a-new-file.patch$')] 777 ('??', '.*/0002-Add-a-new-file.patch$')]
794 self._check_repo_status(os.path.dirname(recipefile), expected_status) 778 self._check_repo_status(os.path.dirname(recipefile), expected_status)
795 779
796 @OETestID(1172)
797 def test_devtool_update_recipe_git(self): 780 def test_devtool_update_recipe_git(self):
798 # Check preconditions 781 # Check preconditions
799 testrecipe = 'mtd-utils' 782 testrecipe = 'mtd-utils'
@@ -863,7 +846,6 @@ class DevtoolUpdateTests(DevtoolBase):
863 ('??', '%s/0002-Add-a-new-file.patch' % relpatchpath)] 846 ('??', '%s/0002-Add-a-new-file.patch' % relpatchpath)]
864 self._check_repo_status(os.path.dirname(recipefile), expected_status) 847 self._check_repo_status(os.path.dirname(recipefile), expected_status)
865 848
866 @OETestID(1170)
867 def test_devtool_update_recipe_append(self): 849 def test_devtool_update_recipe_append(self):
868 # Check preconditions 850 # Check preconditions
869 testrecipe = 'mdadm' 851 testrecipe = 'mdadm'
@@ -932,7 +914,6 @@ class DevtoolUpdateTests(DevtoolBase):
932 self.assertEqual(expectedlines, f.readlines()) 914 self.assertEqual(expectedlines, f.readlines())
933 # Deleting isn't expected to work under these circumstances 915 # Deleting isn't expected to work under these circumstances
934 916
935 @OETestID(1171)
936 def test_devtool_update_recipe_append_git(self): 917 def test_devtool_update_recipe_append_git(self):
937 # Check preconditions 918 # Check preconditions
938 testrecipe = 'mtd-utils' 919 testrecipe = 'mtd-utils'
@@ -1023,7 +1004,6 @@ class DevtoolUpdateTests(DevtoolBase):
1023 self.assertEqual(expectedlines, set(f.readlines())) 1004 self.assertEqual(expectedlines, set(f.readlines()))
1024 # Deleting isn't expected to work under these circumstances 1005 # Deleting isn't expected to work under these circumstances
1025 1006
1026 @OETestID(1370)
1027 def test_devtool_update_recipe_local_files(self): 1007 def test_devtool_update_recipe_local_files(self):
1028 """Check that local source files are copied over instead of patched""" 1008 """Check that local source files are copied over instead of patched"""
1029 testrecipe = 'makedevs' 1009 testrecipe = 'makedevs'
@@ -1055,7 +1035,6 @@ class DevtoolUpdateTests(DevtoolBase):
1055 ('??', '.*/makedevs/0001-Add-new-file.patch$')] 1035 ('??', '.*/makedevs/0001-Add-new-file.patch$')]
1056 self._check_repo_status(os.path.dirname(recipefile), expected_status) 1036 self._check_repo_status(os.path.dirname(recipefile), expected_status)
1057 1037
1058 @OETestID(1371)
1059 def test_devtool_update_recipe_local_files_2(self): 1038 def test_devtool_update_recipe_local_files_2(self):
1060 """Check local source files support when oe-local-files is in Git""" 1039 """Check local source files support when oe-local-files is in Git"""
1061 testrecipe = 'devtool-test-local' 1040 testrecipe = 'devtool-test-local'
@@ -1100,7 +1079,6 @@ class DevtoolUpdateTests(DevtoolBase):
1100 ('??', '.*/0001-Add-new-file.patch$')] 1079 ('??', '.*/0001-Add-new-file.patch$')]
1101 self._check_repo_status(os.path.dirname(recipefile), expected_status) 1080 self._check_repo_status(os.path.dirname(recipefile), expected_status)
1102 1081
1103 @OETestID(1627)
1104 def test_devtool_update_recipe_local_files_3(self): 1082 def test_devtool_update_recipe_local_files_3(self):
1105 # First, modify the recipe 1083 # First, modify the recipe
1106 testrecipe = 'devtool-test-localonly' 1084 testrecipe = 'devtool-test-localonly'
@@ -1120,7 +1098,6 @@ class DevtoolUpdateTests(DevtoolBase):
1120 expected_status = [(' M', '.*/%s/file2$' % testrecipe)] 1098 expected_status = [(' M', '.*/%s/file2$' % testrecipe)]
1121 self._check_repo_status(os.path.dirname(recipefile), expected_status) 1099 self._check_repo_status(os.path.dirname(recipefile), expected_status)
1122 1100
1123 @OETestID(1629)
1124 def test_devtool_update_recipe_local_patch_gz(self): 1101 def test_devtool_update_recipe_local_patch_gz(self):
1125 # First, modify the recipe 1102 # First, modify the recipe
1126 testrecipe = 'devtool-test-patch-gz' 1103 testrecipe = 'devtool-test-patch-gz'
@@ -1148,7 +1125,6 @@ class DevtoolUpdateTests(DevtoolBase):
1148 if 'gzip compressed data' not in result.output: 1125 if 'gzip compressed data' not in result.output:
1149 self.fail('New patch file is not gzipped - file reports:\n%s' % result.output) 1126 self.fail('New patch file is not gzipped - file reports:\n%s' % result.output)
1150 1127
1151 @OETestID(1628)
1152 def test_devtool_update_recipe_local_files_subdir(self): 1128 def test_devtool_update_recipe_local_files_subdir(self):
1153 # Try devtool update-recipe on a recipe that has a file with subdir= set in 1129 # Try devtool update-recipe on a recipe that has a file with subdir= set in
1154 # SRC_URI such that it overwrites a file that was in an archive that 1130 # SRC_URI such that it overwrites a file that was in an archive that
@@ -1177,7 +1153,6 @@ class DevtoolUpdateTests(DevtoolBase):
1177 1153
1178class DevtoolExtractTests(DevtoolBase): 1154class DevtoolExtractTests(DevtoolBase):
1179 1155
1180 @OETestID(1163)
1181 def test_devtool_extract(self): 1156 def test_devtool_extract(self):
1182 tempdir = tempfile.mkdtemp(prefix='devtoolqa') 1157 tempdir = tempfile.mkdtemp(prefix='devtoolqa')
1183 # Try devtool extract 1158 # Try devtool extract
@@ -1188,7 +1163,6 @@ class DevtoolExtractTests(DevtoolBase):
1188 self.assertExists(os.path.join(tempdir, 'Makefile.am'), 'Extracted source could not be found') 1163 self.assertExists(os.path.join(tempdir, 'Makefile.am'), 'Extracted source could not be found')
1189 self._check_src_repo(tempdir) 1164 self._check_src_repo(tempdir)
1190 1165
1191 @OETestID(1379)
1192 def test_devtool_extract_virtual(self): 1166 def test_devtool_extract_virtual(self):
1193 tempdir = tempfile.mkdtemp(prefix='devtoolqa') 1167 tempdir = tempfile.mkdtemp(prefix='devtoolqa')
1194 # Try devtool extract 1168 # Try devtool extract
@@ -1199,7 +1173,6 @@ class DevtoolExtractTests(DevtoolBase):
1199 self.assertExists(os.path.join(tempdir, 'Makefile.am'), 'Extracted source could not be found') 1173 self.assertExists(os.path.join(tempdir, 'Makefile.am'), 'Extracted source could not be found')
1200 self._check_src_repo(tempdir) 1174 self._check_src_repo(tempdir)
1201 1175
1202 @OETestID(1168)
1203 def test_devtool_reset_all(self): 1176 def test_devtool_reset_all(self):
1204 tempdir = tempfile.mkdtemp(prefix='devtoolqa') 1177 tempdir = tempfile.mkdtemp(prefix='devtoolqa')
1205 self.track_for_cleanup(tempdir) 1178 self.track_for_cleanup(tempdir)
@@ -1226,7 +1199,6 @@ class DevtoolExtractTests(DevtoolBase):
1226 matches2 = glob.glob(stampprefix2 + '*') 1199 matches2 = glob.glob(stampprefix2 + '*')
1227 self.assertFalse(matches2, 'Stamp files exist for recipe %s that should have been cleaned' % testrecipe2) 1200 self.assertFalse(matches2, 'Stamp files exist for recipe %s that should have been cleaned' % testrecipe2)
1228 1201
1229 @OETestID(1272)
1230 def test_devtool_deploy_target(self): 1202 def test_devtool_deploy_target(self):
1231 # NOTE: Whilst this test would seemingly be better placed as a runtime test, 1203 # NOTE: Whilst this test would seemingly be better placed as a runtime test,
1232 # unfortunately the runtime tests run under bitbake and you can't run 1204 # unfortunately the runtime tests run under bitbake and you can't run
@@ -1312,7 +1284,6 @@ class DevtoolExtractTests(DevtoolBase):
1312 result = runCmd('ssh %s root@%s %s' % (sshargs, qemu.ip, testcommand), ignore_status=True) 1284 result = runCmd('ssh %s root@%s %s' % (sshargs, qemu.ip, testcommand), ignore_status=True)
1313 self.assertNotEqual(result, 0, 'undeploy-target did not remove command as it should have') 1285 self.assertNotEqual(result, 0, 'undeploy-target did not remove command as it should have')
1314 1286
1315 @OETestID(1366)
1316 def test_devtool_build_image(self): 1287 def test_devtool_build_image(self):
1317 """Test devtool build-image plugin""" 1288 """Test devtool build-image plugin"""
1318 # Check preconditions 1289 # Check preconditions
@@ -1348,7 +1319,6 @@ class DevtoolExtractTests(DevtoolBase):
1348 1319
1349class DevtoolUpgradeTests(DevtoolBase): 1320class DevtoolUpgradeTests(DevtoolBase):
1350 1321
1351 @OETestID(1367)
1352 def test_devtool_upgrade(self): 1322 def test_devtool_upgrade(self):
1353 # Check preconditions 1323 # Check preconditions
1354 self.assertTrue(not os.path.exists(self.workspacedir), 'This test cannot be run with a workspace directory under the build directory') 1324 self.assertTrue(not os.path.exists(self.workspacedir), 'This test cannot be run with a workspace directory under the build directory')
@@ -1393,7 +1363,6 @@ class DevtoolUpgradeTests(DevtoolBase):
1393 self.assertNotIn(recipe, result.output) 1363 self.assertNotIn(recipe, result.output)
1394 self.assertNotExists(os.path.join(self.workspacedir, 'recipes', recipe), 'Recipe directory should not exist after resetting') 1364 self.assertNotExists(os.path.join(self.workspacedir, 'recipes', recipe), 'Recipe directory should not exist after resetting')
1395 1365
1396 @OETestID(1433)
1397 def test_devtool_upgrade_git(self): 1366 def test_devtool_upgrade_git(self):
1398 # Check preconditions 1367 # Check preconditions
1399 self.assertTrue(not os.path.exists(self.workspacedir), 'This test cannot be run with a workspace directory under the build directory') 1368 self.assertTrue(not os.path.exists(self.workspacedir), 'This test cannot be run with a workspace directory under the build directory')
@@ -1430,7 +1399,6 @@ class DevtoolUpgradeTests(DevtoolBase):
1430 self.assertNotIn(recipe, result.output) 1399 self.assertNotIn(recipe, result.output)
1431 self.assertNotExists(os.path.join(self.workspacedir, 'recipes', recipe), 'Recipe directory should not exist after resetting') 1400 self.assertNotExists(os.path.join(self.workspacedir, 'recipes', recipe), 'Recipe directory should not exist after resetting')
1432 1401
1433 @OETestID(1352)
1434 def test_devtool_layer_plugins(self): 1402 def test_devtool_layer_plugins(self):
1435 """Test that devtool can use plugins from other layers. 1403 """Test that devtool can use plugins from other layers.
1436 1404
@@ -1456,7 +1424,6 @@ class DevtoolUpgradeTests(DevtoolBase):
1456 shutil.copy(srcfile, dstfile) 1424 shutil.copy(srcfile, dstfile)
1457 self.track_for_cleanup(dstfile) 1425 self.track_for_cleanup(dstfile)
1458 1426
1459 @OETestID(1625)
1460 def test_devtool_load_plugin(self): 1427 def test_devtool_load_plugin(self):
1461 """Test that devtool loads only the first found plugin in BBPATH.""" 1428 """Test that devtool loads only the first found plugin in BBPATH."""
1462 1429
@@ -1524,7 +1491,6 @@ class DevtoolUpgradeTests(DevtoolBase):
1524 self.assertExists(os.path.join(olddir, patchfn), 'Original patch file does not exist') 1491 self.assertExists(os.path.join(olddir, patchfn), 'Original patch file does not exist')
1525 return recipe, oldrecipefile, recipedir, olddir, newversion, patchfn 1492 return recipe, oldrecipefile, recipedir, olddir, newversion, patchfn
1526 1493
1527 @OETestID(1623)
1528 def test_devtool_finish_upgrade_origlayer(self): 1494 def test_devtool_finish_upgrade_origlayer(self):
1529 recipe, oldrecipefile, recipedir, olddir, newversion, patchfn = self._setup_test_devtool_finish_upgrade() 1495 recipe, oldrecipefile, recipedir, olddir, newversion, patchfn = self._setup_test_devtool_finish_upgrade()
1530 # Ensure the recipe is where we think it should be (so that cleanup doesn't trash things) 1496 # Ensure the recipe is where we think it should be (so that cleanup doesn't trash things)
@@ -1543,7 +1509,6 @@ class DevtoolUpgradeTests(DevtoolBase):
1543 self.assertExists(os.path.join(newdir, patchfn), 'Patch file should have been copied into new directory but wasn\'t') 1509 self.assertExists(os.path.join(newdir, patchfn), 'Patch file should have been copied into new directory but wasn\'t')
1544 self.assertExists(os.path.join(newdir, '0002-Add-a-comment-to-the-code.patch'), 'New patch file should have been created but wasn\'t') 1510 self.assertExists(os.path.join(newdir, '0002-Add-a-comment-to-the-code.patch'), 'New patch file should have been created but wasn\'t')
1545 1511
1546 @OETestID(1624)
1547 def test_devtool_finish_upgrade_otherlayer(self): 1512 def test_devtool_finish_upgrade_otherlayer(self):
1548 recipe, oldrecipefile, recipedir, olddir, newversion, patchfn = self._setup_test_devtool_finish_upgrade() 1513 recipe, oldrecipefile, recipedir, olddir, newversion, patchfn = self._setup_test_devtool_finish_upgrade()
1549 # Ensure the recipe is where we think it should be (so that cleanup doesn't trash things) 1514 # Ensure the recipe is where we think it should be (so that cleanup doesn't trash things)
@@ -1599,7 +1564,6 @@ class DevtoolUpgradeTests(DevtoolBase):
1599 self.fail('Unable to find recipe files directory for %s' % recipe) 1564 self.fail('Unable to find recipe files directory for %s' % recipe)
1600 return recipe, oldrecipefile, recipedir, filesdir 1565 return recipe, oldrecipefile, recipedir, filesdir
1601 1566
1602 @OETestID(1621)
1603 def test_devtool_finish_modify_origlayer(self): 1567 def test_devtool_finish_modify_origlayer(self):
1604 recipe, oldrecipefile, recipedir, filesdir = self._setup_test_devtool_finish_modify() 1568 recipe, oldrecipefile, recipedir, filesdir = self._setup_test_devtool_finish_modify()
1605 # Ensure the recipe is where we think it should be (so that cleanup doesn't trash things) 1569 # Ensure the recipe is where we think it should be (so that cleanup doesn't trash things)
@@ -1614,7 +1578,6 @@ class DevtoolUpgradeTests(DevtoolBase):
1614 ('??', '.*/.*-Add-a-comment-to-the-code.patch$')] 1578 ('??', '.*/.*-Add-a-comment-to-the-code.patch$')]
1615 self._check_repo_status(recipedir, expected_status) 1579 self._check_repo_status(recipedir, expected_status)
1616 1580
1617 @OETestID(1622)
1618 def test_devtool_finish_modify_otherlayer(self): 1581 def test_devtool_finish_modify_otherlayer(self):
1619 recipe, oldrecipefile, recipedir, filesdir = self._setup_test_devtool_finish_modify() 1582 recipe, oldrecipefile, recipedir, filesdir = self._setup_test_devtool_finish_modify()
1620 # Ensure the recipe is where we think it should be (so that cleanup doesn't trash things) 1583 # Ensure the recipe is where we think it should be (so that cleanup doesn't trash things)
@@ -1647,7 +1610,6 @@ class DevtoolUpgradeTests(DevtoolBase):
1647 if files: 1610 if files:
1648 self.fail('Unexpected file(s) copied next to bbappend: %s' % ', '.join(files)) 1611 self.fail('Unexpected file(s) copied next to bbappend: %s' % ', '.join(files))
1649 1612
1650 @OETestID(1626)
1651 def test_devtool_rename(self): 1613 def test_devtool_rename(self):
1652 # Check preconditions 1614 # Check preconditions
1653 self.assertTrue(not os.path.exists(self.workspacedir), 'This test cannot be run with a workspace directory under the build directory') 1615 self.assertTrue(not os.path.exists(self.workspacedir), 'This test cannot be run with a workspace directory under the build directory')
@@ -1708,7 +1670,6 @@ class DevtoolUpgradeTests(DevtoolBase):
1708 checkvars['SRC_URI'] = url 1670 checkvars['SRC_URI'] = url
1709 self._test_recipe_contents(newrecipefile, checkvars, []) 1671 self._test_recipe_contents(newrecipefile, checkvars, [])
1710 1672
1711 @OETestID(1577)
1712 def test_devtool_virtual_kernel_modify(self): 1673 def test_devtool_virtual_kernel_modify(self):
1713 """ 1674 """
1714 Summary: The purpose of this test case is to verify that 1675 Summary: The purpose of this test case is to verify that
diff --git a/meta/lib/oeqa/selftest/cases/distrodata.py b/meta/lib/oeqa/selftest/cases/distrodata.py
index 0b454714e9..8962bda011 100644
--- a/meta/lib/oeqa/selftest/cases/distrodata.py
+++ b/meta/lib/oeqa/selftest/cases/distrodata.py
@@ -2,13 +2,11 @@ from oeqa.selftest.case import OESelftestTestCase
2from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars 2from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars
3from oeqa.utils.decorators import testcase 3from oeqa.utils.decorators import testcase
4from oeqa.utils.ftools import write_file 4from oeqa.utils.ftools import write_file
5from oeqa.core.decorator.oeid import OETestID
6 5
7import oe.recipeutils 6import oe.recipeutils
8 7
9class Distrodata(OESelftestTestCase): 8class Distrodata(OESelftestTestCase):
10 9
11 @OETestID(1902)
12 def test_checkpkg(self): 10 def test_checkpkg(self):
13 """ 11 """
14 Summary: Test that upstream version checks do not regress 12 Summary: Test that upstream version checks do not regress
diff --git a/meta/lib/oeqa/selftest/cases/eSDK.py b/meta/lib/oeqa/selftest/cases/eSDK.py
index 8eb6ec660c..d501238854 100644
--- a/meta/lib/oeqa/selftest/cases/eSDK.py
+++ b/meta/lib/oeqa/selftest/cases/eSDK.py
@@ -3,7 +3,6 @@ import shutil
3import os 3import os
4import glob 4import glob
5import time 5import time
6from oeqa.core.decorator.oeid import OETestID
7from oeqa.selftest.case import OESelftestTestCase 6from oeqa.selftest.case import OESelftestTestCase
8from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars 7from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars
9 8
@@ -104,14 +103,12 @@ SSTATE_MIRRORS = "file://.* file://%s/PATH"
104 cls.tmpdirobj.cleanup() 103 cls.tmpdirobj.cleanup()
105 super().tearDownClass() 104 super().tearDownClass()
106 105
107 @OETestID(1602)
108 def test_install_libraries_headers(self): 106 def test_install_libraries_headers(self):
109 pn_sstate = 'bc' 107 pn_sstate = 'bc'
110 bitbake(pn_sstate) 108 bitbake(pn_sstate)
111 cmd = "devtool sdk-install %s " % pn_sstate 109 cmd = "devtool sdk-install %s " % pn_sstate
112 oeSDKExtSelfTest.run_esdk_cmd(self.env_eSDK, self.tmpdir_eSDKQA, cmd) 110 oeSDKExtSelfTest.run_esdk_cmd(self.env_eSDK, self.tmpdir_eSDKQA, cmd)
113 111
114 @OETestID(1603)
115 def test_image_generation_binary_feeds(self): 112 def test_image_generation_binary_feeds(self):
116 image = 'core-image-minimal' 113 image = 'core-image-minimal'
117 cmd = "devtool build-image %s" % image 114 cmd = "devtool build-image %s" % image
diff --git a/meta/lib/oeqa/selftest/cases/fetch.py b/meta/lib/oeqa/selftest/cases/fetch.py
index 4acc8cdcc8..c5de4fd401 100644
--- a/meta/lib/oeqa/selftest/cases/fetch.py
+++ b/meta/lib/oeqa/selftest/cases/fetch.py
@@ -1,10 +1,8 @@
1import oe.path 1import oe.path
2from oeqa.selftest.case import OESelftestTestCase 2from oeqa.selftest.case import OESelftestTestCase
3from oeqa.utils.commands import bitbake 3from oeqa.utils.commands import bitbake
4from oeqa.core.decorator.oeid import OETestID
5 4
6class Fetch(OESelftestTestCase): 5class Fetch(OESelftestTestCase):
7 @OETestID(1058)
8 def test_git_mirrors(self): 6 def test_git_mirrors(self):
9 """ 7 """
10 Verify that the git fetcher will fall back to the HTTP mirrors. The 8 Verify that the git fetcher will fall back to the HTTP mirrors. The
diff --git a/meta/lib/oeqa/selftest/cases/image_typedep.py b/meta/lib/oeqa/selftest/cases/image_typedep.py
index 932c7f883d..9f1f983e1d 100644
--- a/meta/lib/oeqa/selftest/cases/image_typedep.py
+++ b/meta/lib/oeqa/selftest/cases/image_typedep.py
@@ -2,13 +2,11 @@ import os
2 2
3from oeqa.selftest.case import OESelftestTestCase 3from oeqa.selftest.case import OESelftestTestCase
4from oeqa.utils.commands import bitbake 4from oeqa.utils.commands import bitbake
5from oeqa.core.decorator.oeid import OETestID
6 5
7class ImageTypeDepTests(OESelftestTestCase): 6class ImageTypeDepTests(OESelftestTestCase):
8 7
9 # Verify that when specifying a IMAGE_TYPEDEP_ of the form "foo.bar" that 8 # Verify that when specifying a IMAGE_TYPEDEP_ of the form "foo.bar" that
10 # the conversion type bar gets added as a dep as well 9 # the conversion type bar gets added as a dep as well
11 @OETestID(1633)
12 def test_conversion_typedep_added(self): 10 def test_conversion_typedep_added(self):
13 11
14 self.write_recipeinc('emptytest', """ 12 self.write_recipeinc('emptytest', """
diff --git a/meta/lib/oeqa/selftest/cases/imagefeatures.py b/meta/lib/oeqa/selftest/cases/imagefeatures.py
index aed63e5476..a1d9f12dcc 100644
--- a/meta/lib/oeqa/selftest/cases/imagefeatures.py
+++ b/meta/lib/oeqa/selftest/cases/imagefeatures.py
@@ -1,6 +1,5 @@
1from oeqa.selftest.case import OESelftestTestCase 1from oeqa.selftest.case import OESelftestTestCase
2from oeqa.utils.commands import runCmd, bitbake, get_bb_var, runqemu 2from oeqa.utils.commands import runCmd, bitbake, get_bb_var, runqemu
3from oeqa.core.decorator.oeid import OETestID
4from oeqa.utils.sshcontrol import SSHControl 3from oeqa.utils.sshcontrol import SSHControl
5import os 4import os
6import json 5import json
@@ -10,7 +9,6 @@ class ImageFeatures(OESelftestTestCase):
10 test_user = 'tester' 9 test_user = 'tester'
11 root_user = 'root' 10 root_user = 'root'
12 11
13 @OETestID(1107)
14 def test_non_root_user_can_connect_via_ssh_without_password(self): 12 def test_non_root_user_can_connect_via_ssh_without_password(self):
15 """ 13 """
16 Summary: Check if non root user can connect via ssh without password 14 Summary: Check if non root user can connect via ssh without password
@@ -36,7 +34,6 @@ class ImageFeatures(OESelftestTestCase):
36 status, output = ssh.run("true") 34 status, output = ssh.run("true")
37 self.assertEqual(status, 0, 'ssh to user %s failed with %s' % (user, output)) 35 self.assertEqual(status, 0, 'ssh to user %s failed with %s' % (user, output))
38 36
39 @OETestID(1115)
40 def test_all_users_can_connect_via_ssh_without_password(self): 37 def test_all_users_can_connect_via_ssh_without_password(self):
41 """ 38 """
42 Summary: Check if all users can connect via ssh without password 39 Summary: Check if all users can connect via ssh without password
@@ -66,7 +63,6 @@ class ImageFeatures(OESelftestTestCase):
66 self.assertEqual(status, 0, 'ssh to user tester failed with %s' % output) 63 self.assertEqual(status, 0, 'ssh to user tester failed with %s' % output)
67 64
68 65
69 @OETestID(1116)
70 def test_clutter_image_can_be_built(self): 66 def test_clutter_image_can_be_built(self):
71 """ 67 """
72 Summary: Check if clutter image can be built 68 Summary: Check if clutter image can be built
@@ -79,7 +75,6 @@ class ImageFeatures(OESelftestTestCase):
79 # Build a core-image-clutter 75 # Build a core-image-clutter
80 bitbake('core-image-clutter') 76 bitbake('core-image-clutter')
81 77
82 @OETestID(1117)
83 def test_wayland_support_in_image(self): 78 def test_wayland_support_in_image(self):
84 """ 79 """
85 Summary: Check Wayland support in image 80 Summary: Check Wayland support in image
@@ -97,7 +92,6 @@ class ImageFeatures(OESelftestTestCase):
97 # Build a core-image-weston 92 # Build a core-image-weston
98 bitbake('core-image-weston') 93 bitbake('core-image-weston')
99 94
100 @OETestID(1497)
101 def test_bmap(self): 95 def test_bmap(self):
102 """ 96 """
103 Summary: Check bmap support 97 Summary: Check bmap support
@@ -131,7 +125,6 @@ class ImageFeatures(OESelftestTestCase):
131 # check if the resulting gzip is valid 125 # check if the resulting gzip is valid
132 self.assertTrue(runCmd('gzip -t %s' % gzip_path)) 126 self.assertTrue(runCmd('gzip -t %s' % gzip_path))
133 127
134 @OETestID(1903)
135 def test_hypervisor_fmts(self): 128 def test_hypervisor_fmts(self):
136 """ 129 """
137 Summary: Check various hypervisor formats 130 Summary: Check various hypervisor formats
@@ -166,7 +159,6 @@ class ImageFeatures(OESelftestTestCase):
166 native_sysroot=sysroot) 159 native_sysroot=sysroot)
167 self.assertTrue(json.loads(result.output).get('format') == itype) 160 self.assertTrue(json.loads(result.output).get('format') == itype)
168 161
169 @OETestID(1905)
170 def test_long_chain_conversion(self): 162 def test_long_chain_conversion(self):
171 """ 163 """
172 Summary: Check for chaining many CONVERSION_CMDs together 164 Summary: Check for chaining many CONVERSION_CMDs together
@@ -198,7 +190,6 @@ class ImageFeatures(OESelftestTestCase):
198 self.assertTrue(runCmd('cd %s;sha256sum -c %s.%s.sha256sum' % 190 self.assertTrue(runCmd('cd %s;sha256sum -c %s.%s.sha256sum' %
199 (deploy_dir_image, link_name, conv))) 191 (deploy_dir_image, link_name, conv)))
200 192
201 @OETestID(1904)
202 def test_image_fstypes(self): 193 def test_image_fstypes(self):
203 """ 194 """
204 Summary: Check if image of supported image fstypes can be built 195 Summary: Check if image of supported image fstypes can be built
diff --git a/meta/lib/oeqa/selftest/cases/layerappend.py b/meta/lib/oeqa/selftest/cases/layerappend.py
index 2fd5cdb0c6..18ccda2df8 100644
--- a/meta/lib/oeqa/selftest/cases/layerappend.py
+++ b/meta/lib/oeqa/selftest/cases/layerappend.py
@@ -3,7 +3,6 @@ import os
3from oeqa.selftest.case import OESelftestTestCase 3from oeqa.selftest.case import OESelftestTestCase
4from oeqa.utils.commands import runCmd, bitbake, get_bb_var 4from oeqa.utils.commands import runCmd, bitbake, get_bb_var
5import oeqa.utils.ftools as ftools 5import oeqa.utils.ftools as ftools
6from oeqa.core.decorator.oeid import OETestID
7 6
8class LayerAppendTests(OESelftestTestCase): 7class LayerAppendTests(OESelftestTestCase):
9 layerconf = """ 8 layerconf = """
@@ -49,7 +48,6 @@ SRC_URI_append = " file://appendtest.txt"
49 ftools.remove_from_file(self.builddir + "/conf/bblayers.conf", self.layerappend) 48 ftools.remove_from_file(self.builddir + "/conf/bblayers.conf", self.layerappend)
50 super(LayerAppendTests, self).tearDownLocal() 49 super(LayerAppendTests, self).tearDownLocal()
51 50
52 @OETestID(1196)
53 def test_layer_appends(self): 51 def test_layer_appends(self):
54 corebase = get_bb_var("COREBASE") 52 corebase = get_bb_var("COREBASE")
55 53
diff --git a/meta/lib/oeqa/selftest/cases/liboe.py b/meta/lib/oeqa/selftest/cases/liboe.py
index e84609246a..01b2cab7aa 100644
--- a/meta/lib/oeqa/selftest/cases/liboe.py
+++ b/meta/lib/oeqa/selftest/cases/liboe.py
@@ -1,5 +1,4 @@
1from oeqa.selftest.case import OESelftestTestCase 1from oeqa.selftest.case import OESelftestTestCase
2from oeqa.core.decorator.oeid import OETestID
3from oeqa.utils.commands import get_bb_var, get_bb_vars, bitbake, runCmd 2from oeqa.utils.commands import get_bb_var, get_bb_vars, bitbake, runCmd
4import oe.path 3import oe.path
5import os 4import os
@@ -11,7 +10,6 @@ class LibOE(OESelftestTestCase):
11 super(LibOE, cls).setUpClass() 10 super(LibOE, cls).setUpClass()
12 cls.tmp_dir = get_bb_var('TMPDIR') 11 cls.tmp_dir = get_bb_var('TMPDIR')
13 12
14 @OETestID(1635)
15 def test_copy_tree_special(self): 13 def test_copy_tree_special(self):
16 """ 14 """
17 Summary: oe.path.copytree() should copy files with special character 15 Summary: oe.path.copytree() should copy files with special character
@@ -37,7 +35,6 @@ class LibOE(OESelftestTestCase):
37 35
38 oe.path.remove(testloc) 36 oe.path.remove(testloc)
39 37
40 @OETestID(1636)
41 def test_copy_tree_xattr(self): 38 def test_copy_tree_xattr(self):
42 """ 39 """
43 Summary: oe.path.copytree() should preserve xattr on copied files 40 Summary: oe.path.copytree() should preserve xattr on copied files
@@ -72,7 +69,6 @@ class LibOE(OESelftestTestCase):
72 69
73 oe.path.remove(testloc) 70 oe.path.remove(testloc)
74 71
75 @OETestID(1634)
76 def test_copy_hardlink_tree_count(self): 72 def test_copy_hardlink_tree_count(self):
77 """ 73 """
78 Summary: oe.path.copyhardlinktree() shouldn't miss out files 74 Summary: oe.path.copyhardlinktree() shouldn't miss out files
diff --git a/meta/lib/oeqa/selftest/cases/lic_checksum.py b/meta/lib/oeqa/selftest/cases/lic_checksum.py
index f992b3736e..70b4fe2700 100644
--- a/meta/lib/oeqa/selftest/cases/lic_checksum.py
+++ b/meta/lib/oeqa/selftest/cases/lic_checksum.py
@@ -4,13 +4,11 @@ import tempfile
4from oeqa.selftest.case import OESelftestTestCase 4from oeqa.selftest.case import OESelftestTestCase
5from oeqa.utils.commands import bitbake 5from oeqa.utils.commands import bitbake
6from oeqa.utils import CommandError 6from oeqa.utils import CommandError
7from oeqa.core.decorator.oeid import OETestID
8 7
9class LicenseTests(OESelftestTestCase): 8class LicenseTests(OESelftestTestCase):
10 9
11 # Verify that changing a license file that has an absolute path causes 10 # Verify that changing a license file that has an absolute path causes
12 # the license qa to fail due to a mismatched md5sum. 11 # the license qa to fail due to a mismatched md5sum.
13 @OETestID(1197)
14 def test_nonmatching_checksum(self): 12 def test_nonmatching_checksum(self):
15 bitbake_cmd = '-c populate_lic emptytest' 13 bitbake_cmd = '-c populate_lic emptytest'
16 error_msg = 'emptytest: The new md5 checksum is 8d777f385d3dfec8815d20f7496026dc' 14 error_msg = 'emptytest: The new md5 checksum is 8d777f385d3dfec8815d20f7496026dc'
diff --git a/meta/lib/oeqa/selftest/cases/manifest.py b/meta/lib/oeqa/selftest/cases/manifest.py
index 146071934d..799e1fb47d 100644
--- a/meta/lib/oeqa/selftest/cases/manifest.py
+++ b/meta/lib/oeqa/selftest/cases/manifest.py
@@ -2,7 +2,6 @@ import os
2 2
3from oeqa.selftest.case import OESelftestTestCase 3from oeqa.selftest.case import OESelftestTestCase
4from oeqa.utils.commands import get_bb_var, get_bb_vars, bitbake 4from oeqa.utils.commands import get_bb_var, get_bb_vars, bitbake
5from oeqa.core.decorator.oeid import OETestID
6 5
7class ManifestEntry: 6class ManifestEntry:
8 '''A manifest item of a collection able to list missing packages''' 7 '''A manifest item of a collection able to list missing packages'''
@@ -59,7 +58,6 @@ class VerifyManifest(OESelftestTestCase):
59 self.skipTest("{}: Cannot setup testing scenario"\ 58 self.skipTest("{}: Cannot setup testing scenario"\
60 .format(self.classname)) 59 .format(self.classname))
61 60
62 @OETestID(1380)
63 def test_SDK_manifest_entries(self): 61 def test_SDK_manifest_entries(self):
64 '''Verifying the SDK manifest entries exist, this may take a build''' 62 '''Verifying the SDK manifest entries exist, this may take a build'''
65 63
@@ -126,7 +124,6 @@ class VerifyManifest(OESelftestTestCase):
126 self.logger.info(msg) 124 self.logger.info(msg)
127 self.fail(logmsg) 125 self.fail(logmsg)
128 126
129 @OETestID(1381)
130 def test_image_manifest_entries(self): 127 def test_image_manifest_entries(self):
131 '''Verifying the image manifest entries exist''' 128 '''Verifying the image manifest entries exist'''
132 129
diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py b/meta/lib/oeqa/selftest/cases/meta_ide.py
index 5df9d3ed93..76cbac3c77 100644
--- a/meta/lib/oeqa/selftest/cases/meta_ide.py
+++ b/meta/lib/oeqa/selftest/cases/meta_ide.py
@@ -1,7 +1,6 @@
1from oeqa.selftest.case import OESelftestTestCase 1from oeqa.selftest.case import OESelftestTestCase
2from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject 2from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject
3from oeqa.utils.commands import bitbake, get_bb_vars, runCmd 3from oeqa.utils.commands import bitbake, get_bb_vars, runCmd
4from oeqa.core.decorator.oeid import OETestID
5import tempfile 4import tempfile
6import shutil 5import shutil
7 6
@@ -23,18 +22,15 @@ class MetaIDE(OESelftestTestCase):
23 shutil.rmtree(cls.tmpdir_metaideQA, ignore_errors=True) 22 shutil.rmtree(cls.tmpdir_metaideQA, ignore_errors=True)
24 super(MetaIDE, cls).tearDownClass() 23 super(MetaIDE, cls).tearDownClass()
25 24
26 @OETestID(1982)
27 def test_meta_ide_had_installed_meta_ide_support(self): 25 def test_meta_ide_had_installed_meta_ide_support(self):
28 self.assertExists(self.environment_script_path) 26 self.assertExists(self.environment_script_path)
29 27
30 @OETestID(1983)
31 def test_meta_ide_can_compile_c_program(self): 28 def test_meta_ide_can_compile_c_program(self):
32 runCmd('cp %s/test.c %s' % (self.tc.files_dir, self.tmpdir_metaideQA)) 29 runCmd('cp %s/test.c %s' % (self.tc.files_dir, self.tmpdir_metaideQA))
33 runCmd("cd %s; . %s; $CC test.c -lm" % (self.tmpdir_metaideQA, self.environment_script_path)) 30 runCmd("cd %s; . %s; $CC test.c -lm" % (self.tmpdir_metaideQA, self.environment_script_path))
34 compiled_file = '%s/a.out' % self.tmpdir_metaideQA 31 compiled_file = '%s/a.out' % self.tmpdir_metaideQA
35 self.assertExists(compiled_file) 32 self.assertExists(compiled_file)
36 33
37 @OETestID(1984)
38 def test_meta_ide_can_build_cpio_project(self): 34 def test_meta_ide_can_build_cpio_project(self):
39 dl_dir = self.td.get('DL_DIR', None) 35 dl_dir = self.td.get('DL_DIR', None)
40 self.project = SDKBuildProject(self.tmpdir_metaideQA + "/cpio/", self.environment_script_path, 36 self.project = SDKBuildProject(self.tmpdir_metaideQA + "/cpio/", self.environment_script_path,
diff --git a/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py b/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py
index 08675fd820..f9bec53d4a 100644
--- a/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py
+++ b/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py
@@ -2,7 +2,6 @@ import os
2from oeqa.selftest.case import OESelftestTestCase 2from oeqa.selftest.case import OESelftestTestCase
3import tempfile 3import tempfile
4from oeqa.utils.commands import get_bb_var 4from oeqa.utils.commands import get_bb_var
5from oeqa.core.decorator.oeid import OETestID
6 5
7class TestBlobParsing(OESelftestTestCase): 6class TestBlobParsing(OESelftestTestCase):
8 7
@@ -40,7 +39,6 @@ class TestBlobParsing(OESelftestTestCase):
40 self.repo.git.add("--all") 39 self.repo.git.add("--all")
41 self.repo.git.commit(message=msg) 40 self.repo.git.commit(message=msg)
42 41
43 @OETestID(1859)
44 def test_blob_to_dict(self): 42 def test_blob_to_dict(self):
45 """ 43 """
46 Test convertion of git blobs to dictionary 44 Test convertion of git blobs to dictionary
@@ -53,7 +51,6 @@ class TestBlobParsing(OESelftestTestCase):
53 self.assertEqual(valuesmap, blob_to_dict(blob), 51 self.assertEqual(valuesmap, blob_to_dict(blob),
54 "commit was not translated correctly to dictionary") 52 "commit was not translated correctly to dictionary")
55 53
56 @OETestID(1860)
57 def test_compare_dict_blobs(self): 54 def test_compare_dict_blobs(self):
58 """ 55 """
59 Test comparisson of dictionaries extracted from git blobs 56 Test comparisson of dictionaries extracted from git blobs
@@ -74,7 +71,6 @@ class TestBlobParsing(OESelftestTestCase):
74 var_changes = { x.fieldname : (x.oldvalue, x.newvalue) for x in change_records} 71 var_changes = { x.fieldname : (x.oldvalue, x.newvalue) for x in change_records}
75 self.assertEqual(changesmap, var_changes, "Changes not reported correctly") 72 self.assertEqual(changesmap, var_changes, "Changes not reported correctly")
76 73
77 @OETestID(1861)
78 def test_compare_dict_blobs_default(self): 74 def test_compare_dict_blobs_default(self):
79 """ 75 """
80 Test default values for comparisson of git blob dictionaries 76 Test default values for comparisson of git blob dictionaries
diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py
index bcdc2d5ac0..e0b41e64fb 100644
--- a/meta/lib/oeqa/selftest/cases/oescripts.py
+++ b/meta/lib/oeqa/selftest/cases/oescripts.py
@@ -1,11 +1,9 @@
1from oeqa.selftest.case import OESelftestTestCase 1from oeqa.selftest.case import OESelftestTestCase
2from oeqa.selftest.cases.buildhistory import BuildhistoryBase 2from oeqa.selftest.cases.buildhistory import BuildhistoryBase
3from oeqa.utils.commands import Command, runCmd, bitbake, get_bb_var, get_test_layer 3from oeqa.utils.commands import Command, runCmd, bitbake, get_bb_var, get_test_layer
4from oeqa.core.decorator.oeid import OETestID
5 4
6class BuildhistoryDiffTests(BuildhistoryBase): 5class BuildhistoryDiffTests(BuildhistoryBase):
7 6
8 @OETestID(295)
9 def test_buildhistory_diff(self): 7 def test_buildhistory_diff(self):
10 target = 'xcursor-transparent-theme' 8 target = 'xcursor-transparent-theme'
11 self.run_buildhistory_operation(target, target_config="PR = \"r1\"", change_bh_location=True) 9 self.run_buildhistory_operation(target, target_config="PR = \"r1\"", change_bh_location=True)
diff --git a/meta/lib/oeqa/selftest/cases/package.py b/meta/lib/oeqa/selftest/cases/package.py
index 6596dabc32..c166c87666 100644
--- a/meta/lib/oeqa/selftest/cases/package.py
+++ b/meta/lib/oeqa/selftest/cases/package.py
@@ -1,5 +1,4 @@
1from oeqa.selftest.case import OESelftestTestCase 1from oeqa.selftest.case import OESelftestTestCase
2from oeqa.core.decorator.oeid import OETestID
3from oeqa.utils.commands import bitbake, get_bb_vars, get_bb_var, runqemu 2from oeqa.utils.commands import bitbake, get_bb_vars, get_bb_var, runqemu
4import stat 3import stat
5import subprocess, os 4import subprocess, os
@@ -36,7 +35,6 @@ class VersionOrdering(OESelftestTestCase):
36 self.bindir = type(self).bindir 35 self.bindir = type(self).bindir
37 self.libdir = type(self).libdir 36 self.libdir = type(self).libdir
38 37
39 @OETestID(1880)
40 def test_dpkg(self): 38 def test_dpkg(self):
41 for ver1, ver2, sort in self.tests: 39 for ver1, ver2, sort in self.tests:
42 op = { -1: "<<", 0: "=", 1: ">>" }[sort] 40 op = { -1: "<<", 0: "=", 1: ">>" }[sort]
@@ -53,7 +51,6 @@ class VersionOrdering(OESelftestTestCase):
53 status = subprocess.call((oe.path.join(self.bindir, "dpkg"), "--compare-versions", ver1, op, ver2)) 51 status = subprocess.call((oe.path.join(self.bindir, "dpkg"), "--compare-versions", ver1, op, ver2))
54 self.assertNotEqual(status, 0, "%s %s %s failed" % (ver1, op, ver2)) 52 self.assertNotEqual(status, 0, "%s %s %s failed" % (ver1, op, ver2))
55 53
56 @OETestID(1881)
57 def test_opkg(self): 54 def test_opkg(self):
58 for ver1, ver2, sort in self.tests: 55 for ver1, ver2, sort in self.tests:
59 op = { -1: "<<", 0: "=", 1: ">>" }[sort] 56 op = { -1: "<<", 0: "=", 1: ">>" }[sort]
@@ -70,7 +67,6 @@ class VersionOrdering(OESelftestTestCase):
70 status = subprocess.call((oe.path.join(self.bindir, "opkg"), "compare-versions", ver1, op, ver2)) 67 status = subprocess.call((oe.path.join(self.bindir, "opkg"), "compare-versions", ver1, op, ver2))
71 self.assertNotEqual(status, 0, "%s %s %s failed" % (ver1, op, ver2)) 68 self.assertNotEqual(status, 0, "%s %s %s failed" % (ver1, op, ver2))
72 69
73 @OETestID(1882)
74 def test_rpm(self): 70 def test_rpm(self):
75 # Need to tell the Python bindings where to find its configuration 71 # Need to tell the Python bindings where to find its configuration
76 env = os.environ.copy() 72 env = os.environ.copy()
diff --git a/meta/lib/oeqa/selftest/cases/pkgdata.py b/meta/lib/oeqa/selftest/cases/pkgdata.py
index aa05f40d6a..58ec6e0ebc 100644
--- a/meta/lib/oeqa/selftest/cases/pkgdata.py
+++ b/meta/lib/oeqa/selftest/cases/pkgdata.py
@@ -4,7 +4,6 @@ import fnmatch
4 4
5from oeqa.selftest.case import OESelftestTestCase 5from oeqa.selftest.case import OESelftestTestCase
6from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars 6from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars
7from oeqa.core.decorator.oeid import OETestID
8 7
9class OePkgdataUtilTests(OESelftestTestCase): 8class OePkgdataUtilTests(OESelftestTestCase):
10 9
@@ -16,7 +15,6 @@ class OePkgdataUtilTests(OESelftestTestCase):
16 bitbake('target-sdk-provides-dummy -c clean') 15 bitbake('target-sdk-provides-dummy -c clean')
17 bitbake('busybox zlib m4') 16 bitbake('busybox zlib m4')
18 17
19 @OETestID(1203)
20 def test_lookup_pkg(self): 18 def test_lookup_pkg(self):
21 # Forward tests 19 # Forward tests
22 result = runCmd('oe-pkgdata-util lookup-pkg "zlib busybox"') 20 result = runCmd('oe-pkgdata-util lookup-pkg "zlib busybox"')
@@ -35,7 +33,6 @@ class OePkgdataUtilTests(OESelftestTestCase):
35 self.assertEqual(result.status, 1, "Status different than 1. output: %s" % result.output) 33 self.assertEqual(result.status, 1, "Status different than 1. output: %s" % result.output)
36 self.assertEqual(result.output, 'ERROR: The following packages could not be found: nonexistentpkg') 34 self.assertEqual(result.output, 'ERROR: The following packages could not be found: nonexistentpkg')
37 35
38 @OETestID(1205)
39 def test_read_value(self): 36 def test_read_value(self):
40 result = runCmd('oe-pkgdata-util read-value PN libz1') 37 result = runCmd('oe-pkgdata-util read-value PN libz1')
41 self.assertEqual(result.output, 'zlib') 38 self.assertEqual(result.output, 'zlib')
@@ -45,7 +42,6 @@ class OePkgdataUtilTests(OESelftestTestCase):
45 pkgsize = int(result.output.strip()) 42 pkgsize = int(result.output.strip())
46 self.assertGreater(pkgsize, 1, "Size should be greater than 1. %s" % result.output) 43 self.assertGreater(pkgsize, 1, "Size should be greater than 1. %s" % result.output)
47 44
48 @OETestID(1198)
49 def test_find_path(self): 45 def test_find_path(self):
50 result = runCmd('oe-pkgdata-util find-path /lib/libz.so.1') 46 result = runCmd('oe-pkgdata-util find-path /lib/libz.so.1')
51 self.assertEqual(result.output, 'zlib: /lib/libz.so.1') 47 self.assertEqual(result.output, 'zlib: /lib/libz.so.1')
@@ -55,7 +51,6 @@ class OePkgdataUtilTests(OESelftestTestCase):
55 self.assertEqual(result.status, 1, "Status different than 1. output: %s" % result.output) 51 self.assertEqual(result.status, 1, "Status different than 1. output: %s" % result.output)
56 self.assertEqual(result.output, 'ERROR: Unable to find any package producing path /not/exist') 52 self.assertEqual(result.output, 'ERROR: Unable to find any package producing path /not/exist')
57 53
58 @OETestID(1204)
59 def test_lookup_recipe(self): 54 def test_lookup_recipe(self):
60 result = runCmd('oe-pkgdata-util lookup-recipe "libz-staticdev busybox"') 55 result = runCmd('oe-pkgdata-util lookup-recipe "libz-staticdev busybox"')
61 self.assertEqual(result.output, 'zlib\nbusybox') 56 self.assertEqual(result.output, 'zlib\nbusybox')
@@ -65,7 +60,6 @@ class OePkgdataUtilTests(OESelftestTestCase):
65 self.assertEqual(result.status, 1, "Status different than 1. output: %s" % result.output) 60 self.assertEqual(result.status, 1, "Status different than 1. output: %s" % result.output)
66 self.assertEqual(result.output, 'ERROR: The following packages could not be found: nonexistentpkg') 61 self.assertEqual(result.output, 'ERROR: The following packages could not be found: nonexistentpkg')
67 62
68 @OETestID(1202)
69 def test_list_pkgs(self): 63 def test_list_pkgs(self):
70 # No arguments 64 # No arguments
71 result = runCmd('oe-pkgdata-util list-pkgs') 65 result = runCmd('oe-pkgdata-util list-pkgs')
@@ -109,7 +103,6 @@ class OePkgdataUtilTests(OESelftestTestCase):
109 pkglist = sorted(result.output.split()) 103 pkglist = sorted(result.output.split())
110 self.assertEqual(pkglist, ['libz-dbg', 'libz-dev', 'libz-doc'], "Packages listed: %s" % result.output) 104 self.assertEqual(pkglist, ['libz-dbg', 'libz-dev', 'libz-doc'], "Packages listed: %s" % result.output)
111 105
112 @OETestID(1201)
113 def test_list_pkg_files(self): 106 def test_list_pkg_files(self):
114 def splitoutput(output): 107 def splitoutput(output):
115 files = {} 108 files = {}
@@ -199,7 +192,6 @@ class OePkgdataUtilTests(OESelftestTestCase):
199 self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['libz-doc']) 192 self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['libz-doc'])
200 self.assertIn(os.path.join(libdir, 'libz.a'), files['libz-staticdev']) 193 self.assertIn(os.path.join(libdir, 'libz.a'), files['libz-staticdev'])
201 194
202 @OETestID(1200)
203 def test_glob(self): 195 def test_glob(self):
204 tempdir = tempfile.mkdtemp(prefix='pkgdataqa') 196 tempdir = tempfile.mkdtemp(prefix='pkgdataqa')
205 self.track_for_cleanup(tempdir) 197 self.track_for_cleanup(tempdir)
@@ -219,7 +211,6 @@ class OePkgdataUtilTests(OESelftestTestCase):
219 self.assertNotIn('libz-dev', resultlist) 211 self.assertNotIn('libz-dev', resultlist)
220 self.assertNotIn('libz-dbg', resultlist) 212 self.assertNotIn('libz-dbg', resultlist)
221 213
222 @OETestID(1206)
223 def test_specify_pkgdatadir(self): 214 def test_specify_pkgdatadir(self):
224 result = runCmd('oe-pkgdata-util -p %s lookup-pkg zlib' % get_bb_var('PKGDATA_DIR')) 215 result = runCmd('oe-pkgdata-util -p %s lookup-pkg zlib' % get_bb_var('PKGDATA_DIR'))
225 self.assertEqual(result.output, 'libz1') 216 self.assertEqual(result.output, 'libz1')
diff --git a/meta/lib/oeqa/selftest/cases/prservice.py b/meta/lib/oeqa/selftest/cases/prservice.py
index 796ad4f5fe..b0a68a0b1f 100644
--- a/meta/lib/oeqa/selftest/cases/prservice.py
+++ b/meta/lib/oeqa/selftest/cases/prservice.py
@@ -6,7 +6,6 @@ import datetime
6import oeqa.utils.ftools as ftools 6import oeqa.utils.ftools as ftools
7from oeqa.selftest.case import OESelftestTestCase 7from oeqa.selftest.case import OESelftestTestCase
8from oeqa.utils.commands import runCmd, bitbake, get_bb_var 8from oeqa.utils.commands import runCmd, bitbake, get_bb_var
9from oeqa.core.decorator.oeid import OETestID
10from oeqa.utils.network import get_free_port 9from oeqa.utils.network import get_free_port
11 10
12class BitbakePrTests(OESelftestTestCase): 11class BitbakePrTests(OESelftestTestCase):
@@ -88,39 +87,30 @@ class BitbakePrTests(OESelftestTestCase):
88 87
89 self.assertTrue(pr_2 - pr_1 == 1, "Step between same pkg. revision is greater than 1") 88 self.assertTrue(pr_2 - pr_1 == 1, "Step between same pkg. revision is greater than 1")
90 89
91 @OETestID(930)
92 def test_import_export_replace_db(self): 90 def test_import_export_replace_db(self):
93 self.run_test_pr_export_import('m4') 91 self.run_test_pr_export_import('m4')
94 92
95 @OETestID(931)
96 def test_import_export_override_db(self): 93 def test_import_export_override_db(self):
97 self.run_test_pr_export_import('m4', replace_current_db=False) 94 self.run_test_pr_export_import('m4', replace_current_db=False)
98 95
99 @OETestID(932)
100 def test_pr_service_rpm_arch_dep(self): 96 def test_pr_service_rpm_arch_dep(self):
101 self.run_test_pr_service('m4', 'rpm', 'do_package') 97 self.run_test_pr_service('m4', 'rpm', 'do_package')
102 98
103 @OETestID(934)
104 def test_pr_service_deb_arch_dep(self): 99 def test_pr_service_deb_arch_dep(self):
105 self.run_test_pr_service('m4', 'deb', 'do_package') 100 self.run_test_pr_service('m4', 'deb', 'do_package')
106 101
107 @OETestID(933)
108 def test_pr_service_ipk_arch_dep(self): 102 def test_pr_service_ipk_arch_dep(self):
109 self.run_test_pr_service('m4', 'ipk', 'do_package') 103 self.run_test_pr_service('m4', 'ipk', 'do_package')
110 104
111 @OETestID(935)
112 def test_pr_service_rpm_arch_indep(self): 105 def test_pr_service_rpm_arch_indep(self):
113 self.run_test_pr_service('xcursor-transparent-theme', 'rpm', 'do_package') 106 self.run_test_pr_service('xcursor-transparent-theme', 'rpm', 'do_package')
114 107
115 @OETestID(937)
116 def test_pr_service_deb_arch_indep(self): 108 def test_pr_service_deb_arch_indep(self):
117 self.run_test_pr_service('xcursor-transparent-theme', 'deb', 'do_package') 109 self.run_test_pr_service('xcursor-transparent-theme', 'deb', 'do_package')
118 110
119 @OETestID(936)
120 def test_pr_service_ipk_arch_indep(self): 111 def test_pr_service_ipk_arch_indep(self):
121 self.run_test_pr_service('xcursor-transparent-theme', 'ipk', 'do_package') 112 self.run_test_pr_service('xcursor-transparent-theme', 'ipk', 'do_package')
122 113
123 @OETestID(1419)
124 def test_stopping_prservice_message(self): 114 def test_stopping_prservice_message(self):
125 port = get_free_port() 115 port = get_free_port()
126 116
diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py b/meta/lib/oeqa/selftest/cases/recipetool.py
index 06f980e1b0..439d87f834 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -5,7 +5,6 @@ import urllib.parse
5 5
6from oeqa.utils.commands import runCmd, bitbake, get_bb_var 6from oeqa.utils.commands import runCmd, bitbake, get_bb_var
7from oeqa.utils.commands import get_bb_vars, create_temp_layer 7from oeqa.utils.commands import get_bb_vars, create_temp_layer
8from oeqa.core.decorator.oeid import OETestID
9from oeqa.selftest.cases import devtool 8from oeqa.selftest.cases import devtool
10 9
11templayerdir = None 10templayerdir = None
@@ -89,7 +88,6 @@ class RecipetoolTests(RecipetoolBase):
89 for errorstr in checkerror: 88 for errorstr in checkerror:
90 self.assertIn(errorstr, result.output) 89 self.assertIn(errorstr, result.output)
91 90
92 @OETestID(1177)
93 def test_recipetool_appendfile_basic(self): 91 def test_recipetool_appendfile_basic(self):
94 # Basic test 92 # Basic test
95 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 93 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n',
@@ -97,14 +95,12 @@ class RecipetoolTests(RecipetoolBase):
97 _, output = self._try_recipetool_appendfile('base-files', '/etc/motd', self.testfile, '', expectedlines, ['motd']) 95 _, output = self._try_recipetool_appendfile('base-files', '/etc/motd', self.testfile, '', expectedlines, ['motd'])
98 self.assertNotIn('WARNING: ', output) 96 self.assertNotIn('WARNING: ', output)
99 97
100 @OETestID(1183)
101 def test_recipetool_appendfile_invalid(self): 98 def test_recipetool_appendfile_invalid(self):
102 # Test some commands that should error 99 # Test some commands that should error
103 self._try_recipetool_appendfile_fail('/etc/passwd', self.testfile, ['ERROR: /etc/passwd cannot be handled by this tool', 'useradd', 'extrausers']) 100 self._try_recipetool_appendfile_fail('/etc/passwd', self.testfile, ['ERROR: /etc/passwd cannot be handled by this tool', 'useradd', 'extrausers'])
104 self._try_recipetool_appendfile_fail('/etc/timestamp', self.testfile, ['ERROR: /etc/timestamp cannot be handled by this tool']) 101 self._try_recipetool_appendfile_fail('/etc/timestamp', self.testfile, ['ERROR: /etc/timestamp cannot be handled by this tool'])
105 self._try_recipetool_appendfile_fail('/dev/console', self.testfile, ['ERROR: /dev/console cannot be handled by this tool']) 102 self._try_recipetool_appendfile_fail('/dev/console', self.testfile, ['ERROR: /dev/console cannot be handled by this tool'])
106 103
107 @OETestID(1176)
108 def test_recipetool_appendfile_alternatives(self): 104 def test_recipetool_appendfile_alternatives(self):
109 # Now try with a file we know should be an alternative 105 # Now try with a file we know should be an alternative
110 # (this is very much a fake example, but one we know is reliably an alternative) 106 # (this is very much a fake example, but one we know is reliably an alternative)
@@ -128,7 +124,6 @@ class RecipetoolTests(RecipetoolBase):
128 result = runCmd('diff -q %s %s' % (testfile2, copiedfile), ignore_status=True) 124 result = runCmd('diff -q %s %s' % (testfile2, copiedfile), ignore_status=True)
129 self.assertNotEqual(result.status, 0, 'New file should have been copied but was not %s' % result.output) 125 self.assertNotEqual(result.status, 0, 'New file should have been copied but was not %s' % result.output)
130 126
131 @OETestID(1178)
132 def test_recipetool_appendfile_binary(self): 127 def test_recipetool_appendfile_binary(self):
133 # Try appending a binary file 128 # Try appending a binary file
134 # /bin/ls can be a symlink to /usr/bin/ls 129 # /bin/ls can be a symlink to /usr/bin/ls
@@ -137,7 +132,6 @@ class RecipetoolTests(RecipetoolBase):
137 self.assertIn('WARNING: ', result.output) 132 self.assertIn('WARNING: ', result.output)
138 self.assertIn('is a binary', result.output) 133 self.assertIn('is a binary', result.output)
139 134
140 @OETestID(1173)
141 def test_recipetool_appendfile_add(self): 135 def test_recipetool_appendfile_add(self):
142 # Try arbitrary file add to a recipe 136 # Try arbitrary file add to a recipe
143 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 137 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n',
@@ -166,7 +160,6 @@ class RecipetoolTests(RecipetoolBase):
166 '}\n'] 160 '}\n']
167 self._try_recipetool_appendfile('netbase', '/usr/share/scriptname', testfile2, '-r netbase', expectedlines, ['testfile', testfile2name]) 161 self._try_recipetool_appendfile('netbase', '/usr/share/scriptname', testfile2, '-r netbase', expectedlines, ['testfile', testfile2name])
168 162
169 @OETestID(1174)
170 def test_recipetool_appendfile_add_bindir(self): 163 def test_recipetool_appendfile_add_bindir(self):
171 # Try arbitrary file add to a recipe, this time to a location such that should be installed as executable 164 # Try arbitrary file add to a recipe, this time to a location such that should be installed as executable
172 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 165 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n',
@@ -180,7 +173,6 @@ class RecipetoolTests(RecipetoolBase):
180 _, output = self._try_recipetool_appendfile('netbase', '/usr/bin/selftest-recipetool-testbin', self.testfile, '-r netbase', expectedlines, ['testfile']) 173 _, output = self._try_recipetool_appendfile('netbase', '/usr/bin/selftest-recipetool-testbin', self.testfile, '-r netbase', expectedlines, ['testfile'])
181 self.assertNotIn('WARNING: ', output) 174 self.assertNotIn('WARNING: ', output)
182 175
183 @OETestID(1175)
184 def test_recipetool_appendfile_add_machine(self): 176 def test_recipetool_appendfile_add_machine(self):
185 # Try arbitrary file add to a recipe, this time to a location such that should be installed as executable 177 # Try arbitrary file add to a recipe, this time to a location such that should be installed as executable
186 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 178 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n',
@@ -196,7 +188,6 @@ class RecipetoolTests(RecipetoolBase):
196 _, output = self._try_recipetool_appendfile('netbase', '/usr/share/something', self.testfile, '-r netbase -m mymachine', expectedlines, ['mymachine/testfile']) 188 _, output = self._try_recipetool_appendfile('netbase', '/usr/share/something', self.testfile, '-r netbase -m mymachine', expectedlines, ['mymachine/testfile'])
197 self.assertNotIn('WARNING: ', output) 189 self.assertNotIn('WARNING: ', output)
198 190
199 @OETestID(1184)
200 def test_recipetool_appendfile_orig(self): 191 def test_recipetool_appendfile_orig(self):
201 # A file that's in SRC_URI and in do_install with the same name 192 # A file that's in SRC_URI and in do_install with the same name
202 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 193 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n',
@@ -204,7 +195,6 @@ class RecipetoolTests(RecipetoolBase):
204 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-orig', self.testfile, '', expectedlines, ['selftest-replaceme-orig']) 195 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-orig', self.testfile, '', expectedlines, ['selftest-replaceme-orig'])
205 self.assertNotIn('WARNING: ', output) 196 self.assertNotIn('WARNING: ', output)
206 197
207 @OETestID(1191)
208 def test_recipetool_appendfile_todir(self): 198 def test_recipetool_appendfile_todir(self):
209 # A file that's in SRC_URI and in do_install with destination directory rather than file 199 # A file that's in SRC_URI and in do_install with destination directory rather than file
210 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 200 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n',
@@ -212,7 +202,6 @@ class RecipetoolTests(RecipetoolBase):
212 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-todir', self.testfile, '', expectedlines, ['selftest-replaceme-todir']) 202 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-todir', self.testfile, '', expectedlines, ['selftest-replaceme-todir'])
213 self.assertNotIn('WARNING: ', output) 203 self.assertNotIn('WARNING: ', output)
214 204
215 @OETestID(1187)
216 def test_recipetool_appendfile_renamed(self): 205 def test_recipetool_appendfile_renamed(self):
217 # A file that's in SRC_URI with a different name to the destination file 206 # A file that's in SRC_URI with a different name to the destination file
218 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 207 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n',
@@ -220,7 +209,6 @@ class RecipetoolTests(RecipetoolBase):
220 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-renamed', self.testfile, '', expectedlines, ['file1']) 209 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-renamed', self.testfile, '', expectedlines, ['file1'])
221 self.assertNotIn('WARNING: ', output) 210 self.assertNotIn('WARNING: ', output)
222 211
223 @OETestID(1190)
224 def test_recipetool_appendfile_subdir(self): 212 def test_recipetool_appendfile_subdir(self):
225 # A file that's in SRC_URI in a subdir 213 # A file that's in SRC_URI in a subdir
226 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 214 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n',
@@ -234,7 +222,6 @@ class RecipetoolTests(RecipetoolBase):
234 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-subdir', self.testfile, '', expectedlines, ['testfile']) 222 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-subdir', self.testfile, '', expectedlines, ['testfile'])
235 self.assertNotIn('WARNING: ', output) 223 self.assertNotIn('WARNING: ', output)
236 224
237 @OETestID(1189)
238 def test_recipetool_appendfile_src_glob(self): 225 def test_recipetool_appendfile_src_glob(self):
239 # A file that's in SRC_URI as a glob 226 # A file that's in SRC_URI as a glob
240 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 227 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n',
@@ -248,7 +235,6 @@ class RecipetoolTests(RecipetoolBase):
248 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-src-globfile', self.testfile, '', expectedlines, ['testfile']) 235 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-src-globfile', self.testfile, '', expectedlines, ['testfile'])
249 self.assertNotIn('WARNING: ', output) 236 self.assertNotIn('WARNING: ', output)
250 237
251 @OETestID(1181)
252 def test_recipetool_appendfile_inst_glob(self): 238 def test_recipetool_appendfile_inst_glob(self):
253 # A file that's in do_install as a glob 239 # A file that's in do_install as a glob
254 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 240 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n',
@@ -256,7 +242,6 @@ class RecipetoolTests(RecipetoolBase):
256 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-inst-globfile', self.testfile, '', expectedlines, ['selftest-replaceme-inst-globfile']) 242 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-inst-globfile', self.testfile, '', expectedlines, ['selftest-replaceme-inst-globfile'])
257 self.assertNotIn('WARNING: ', output) 243 self.assertNotIn('WARNING: ', output)
258 244
259 @OETestID(1182)
260 def test_recipetool_appendfile_inst_todir_glob(self): 245 def test_recipetool_appendfile_inst_todir_glob(self):
261 # A file that's in do_install as a glob with destination as a directory 246 # A file that's in do_install as a glob with destination as a directory
262 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 247 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n',
@@ -264,7 +249,6 @@ class RecipetoolTests(RecipetoolBase):
264 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-inst-todir-globfile', self.testfile, '', expectedlines, ['selftest-replaceme-inst-todir-globfile']) 249 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-inst-todir-globfile', self.testfile, '', expectedlines, ['selftest-replaceme-inst-todir-globfile'])
265 self.assertNotIn('WARNING: ', output) 250 self.assertNotIn('WARNING: ', output)
266 251
267 @OETestID(1185)
268 def test_recipetool_appendfile_patch(self): 252 def test_recipetool_appendfile_patch(self):
269 # A file that's added by a patch in SRC_URI 253 # A file that's added by a patch in SRC_URI
270 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 254 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n',
@@ -283,7 +267,6 @@ class RecipetoolTests(RecipetoolBase):
283 else: 267 else:
284 self.fail('Patch warning not found in output:\n%s' % output) 268 self.fail('Patch warning not found in output:\n%s' % output)
285 269
286 @OETestID(1188)
287 def test_recipetool_appendfile_script(self): 270 def test_recipetool_appendfile_script(self):
288 # Now, a file that's in SRC_URI but installed by a script (so no mention in do_install) 271 # Now, a file that's in SRC_URI but installed by a script (so no mention in do_install)
289 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 272 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n',
@@ -297,7 +280,6 @@ class RecipetoolTests(RecipetoolBase):
297 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-scripted', self.testfile, '', expectedlines, ['testfile']) 280 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-scripted', self.testfile, '', expectedlines, ['testfile'])
298 self.assertNotIn('WARNING: ', output) 281 self.assertNotIn('WARNING: ', output)
299 282
300 @OETestID(1180)
301 def test_recipetool_appendfile_inst_func(self): 283 def test_recipetool_appendfile_inst_func(self):
302 # A file that's installed from a function called by do_install 284 # A file that's installed from a function called by do_install
303 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 285 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n',
@@ -305,7 +287,6 @@ class RecipetoolTests(RecipetoolBase):
305 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-inst-func', self.testfile, '', expectedlines, ['selftest-replaceme-inst-func']) 287 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-inst-func', self.testfile, '', expectedlines, ['selftest-replaceme-inst-func'])
306 self.assertNotIn('WARNING: ', output) 288 self.assertNotIn('WARNING: ', output)
307 289
308 @OETestID(1186)
309 def test_recipetool_appendfile_postinstall(self): 290 def test_recipetool_appendfile_postinstall(self):
310 # A file that's created by a postinstall script (and explicitly mentioned in it) 291 # A file that's created by a postinstall script (and explicitly mentioned in it)
311 # First try without specifying recipe 292 # First try without specifying recipe
@@ -321,7 +302,6 @@ class RecipetoolTests(RecipetoolBase):
321 '}\n'] 302 '}\n']
322 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-postinst', self.testfile, '-r selftest-recipetool-appendfile', expectedlines, ['testfile']) 303 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-postinst', self.testfile, '-r selftest-recipetool-appendfile', expectedlines, ['testfile'])
323 304
324 @OETestID(1179)
325 def test_recipetool_appendfile_extlayer(self): 305 def test_recipetool_appendfile_extlayer(self):
326 # Try creating a bbappend in a layer that's not in bblayers.conf and has a different structure 306 # Try creating a bbappend in a layer that's not in bblayers.conf and has a different structure
327 exttemplayerdir = os.path.join(self.tempdir, 'extlayer') 307 exttemplayerdir = os.path.join(self.tempdir, 'extlayer')
@@ -337,7 +317,6 @@ class RecipetoolTests(RecipetoolBase):
337 'metadata/recipes/recipes-test/selftest-recipetool-appendfile/selftest-recipetool-appendfile/selftest-replaceme-orig'] 317 'metadata/recipes/recipes-test/selftest-recipetool-appendfile/selftest-recipetool-appendfile/selftest-replaceme-orig']
338 self.assertEqual(sorted(createdfiles), sorted(expectedfiles)) 318 self.assertEqual(sorted(createdfiles), sorted(expectedfiles))
339 319
340 @OETestID(1192)
341 def test_recipetool_appendfile_wildcard(self): 320 def test_recipetool_appendfile_wildcard(self):
342 321
343 def try_appendfile_wc(options): 322 def try_appendfile_wc(options):
@@ -362,7 +341,6 @@ class RecipetoolTests(RecipetoolBase):
362 filename = try_appendfile_wc('-w') 341 filename = try_appendfile_wc('-w')
363 self.assertEqual(filename, recipefn.split('_')[0] + '_%.bbappend') 342 self.assertEqual(filename, recipefn.split('_')[0] + '_%.bbappend')
364 343
365 @OETestID(1193)
366 def test_recipetool_create(self): 344 def test_recipetool_create(self):
367 # Try adding a recipe 345 # Try adding a recipe
368 tempsrc = os.path.join(self.tempdir, 'srctree') 346 tempsrc = os.path.join(self.tempdir, 'srctree')
@@ -379,7 +357,6 @@ class RecipetoolTests(RecipetoolBase):
379 checkvars['SRC_URI[sha256sum]'] = '2e6a401cac9024db2288297e3be1a8ab60e7401ba8e91225218aaf4a27e82a07' 357 checkvars['SRC_URI[sha256sum]'] = '2e6a401cac9024db2288297e3be1a8ab60e7401ba8e91225218aaf4a27e82a07'
380 self._test_recipe_contents(recipefile, checkvars, []) 358 self._test_recipe_contents(recipefile, checkvars, [])
381 359
382 @OETestID(1194)
383 def test_recipetool_create_git(self): 360 def test_recipetool_create_git(self):
384 if 'x11' not in get_bb_var('DISTRO_FEATURES'): 361 if 'x11' not in get_bb_var('DISTRO_FEATURES'):
385 self.skipTest('Test requires x11 as distro feature') 362 self.skipTest('Test requires x11 as distro feature')
@@ -402,7 +379,6 @@ class RecipetoolTests(RecipetoolBase):
402 inherits = ['autotools', 'pkgconfig'] 379 inherits = ['autotools', 'pkgconfig']
403 self._test_recipe_contents(recipefile, checkvars, inherits) 380 self._test_recipe_contents(recipefile, checkvars, inherits)
404 381
405 @OETestID(1392)
406 def test_recipetool_create_simple(self): 382 def test_recipetool_create_simple(self):
407 # Try adding a recipe 383 # Try adding a recipe
408 temprecipe = os.path.join(self.tempdir, 'recipe') 384 temprecipe = os.path.join(self.tempdir, 'recipe')
@@ -425,7 +401,6 @@ class RecipetoolTests(RecipetoolBase):
425 inherits = ['autotools'] 401 inherits = ['autotools']
426 self._test_recipe_contents(os.path.join(temprecipe, dirlist[0]), checkvars, inherits) 402 self._test_recipe_contents(os.path.join(temprecipe, dirlist[0]), checkvars, inherits)
427 403
428 @OETestID(1418)
429 def test_recipetool_create_cmake(self): 404 def test_recipetool_create_cmake(self):
430 bitbake('-c packagedata gtk+') 405 bitbake('-c packagedata gtk+')
431 406
@@ -445,7 +420,6 @@ class RecipetoolTests(RecipetoolBase):
445 inherits = ['cmake', 'python-dir', 'gettext', 'pkgconfig'] 420 inherits = ['cmake', 'python-dir', 'gettext', 'pkgconfig']
446 self._test_recipe_contents(recipefile, checkvars, inherits) 421 self._test_recipe_contents(recipefile, checkvars, inherits)
447 422
448 @OETestID(1638)
449 def test_recipetool_create_github(self): 423 def test_recipetool_create_github(self):
450 # Basic test to see if github URL mangling works 424 # Basic test to see if github URL mangling works
451 temprecipe = os.path.join(self.tempdir, 'recipe') 425 temprecipe = os.path.join(self.tempdir, 'recipe')
@@ -460,7 +434,6 @@ class RecipetoolTests(RecipetoolBase):
460 inherits = ['setuptools'] 434 inherits = ['setuptools']
461 self._test_recipe_contents(recipefile, checkvars, inherits) 435 self._test_recipe_contents(recipefile, checkvars, inherits)
462 436
463 @OETestID(1639)
464 def test_recipetool_create_github_tarball(self): 437 def test_recipetool_create_github_tarball(self):
465 # Basic test to ensure github URL mangling doesn't apply to release tarballs 438 # Basic test to ensure github URL mangling doesn't apply to release tarballs
466 temprecipe = os.path.join(self.tempdir, 'recipe') 439 temprecipe = os.path.join(self.tempdir, 'recipe')
@@ -476,7 +449,6 @@ class RecipetoolTests(RecipetoolBase):
476 inherits = ['setuptools'] 449 inherits = ['setuptools']
477 self._test_recipe_contents(recipefile, checkvars, inherits) 450 self._test_recipe_contents(recipefile, checkvars, inherits)
478 451
479 @OETestID(1637)
480 def test_recipetool_create_git_http(self): 452 def test_recipetool_create_git_http(self):
481 # Basic test to check http git URL mangling works 453 # Basic test to check http git URL mangling works
482 temprecipe = os.path.join(self.tempdir, 'recipe') 454 temprecipe = os.path.join(self.tempdir, 'recipe')
@@ -504,7 +476,6 @@ class RecipetoolTests(RecipetoolBase):
504 shutil.copy(srcfile, dstfile) 476 shutil.copy(srcfile, dstfile)
505 self.track_for_cleanup(dstfile) 477 self.track_for_cleanup(dstfile)
506 478
507 @OETestID(1640)
508 def test_recipetool_load_plugin(self): 479 def test_recipetool_load_plugin(self):
509 """Test that recipetool loads only the first found plugin in BBPATH.""" 480 """Test that recipetool loads only the first found plugin in BBPATH."""
510 481
@@ -626,11 +597,9 @@ class RecipetoolAppendsrcBase(RecipetoolBase):
626 597
627class RecipetoolAppendsrcTests(RecipetoolAppendsrcBase): 598class RecipetoolAppendsrcTests(RecipetoolAppendsrcBase):
628 599
629 @OETestID(1273)
630 def test_recipetool_appendsrcfile_basic(self): 600 def test_recipetool_appendsrcfile_basic(self):
631 self._test_appendsrcfile('base-files', 'a-file') 601 self._test_appendsrcfile('base-files', 'a-file')
632 602
633 @OETestID(1274)
634 def test_recipetool_appendsrcfile_basic_wildcard(self): 603 def test_recipetool_appendsrcfile_basic_wildcard(self):
635 testrecipe = 'base-files' 604 testrecipe = 'base-files'
636 self._test_appendsrcfile(testrecipe, 'a-file', options='-w') 605 self._test_appendsrcfile(testrecipe, 'a-file', options='-w')
@@ -638,15 +607,12 @@ class RecipetoolAppendsrcTests(RecipetoolAppendsrcBase):
638 bbappendfile = self._check_bbappend(testrecipe, recipefile, self.templayerdir) 607 bbappendfile = self._check_bbappend(testrecipe, recipefile, self.templayerdir)
639 self.assertEqual(os.path.basename(bbappendfile), '%s_%%.bbappend' % testrecipe) 608 self.assertEqual(os.path.basename(bbappendfile), '%s_%%.bbappend' % testrecipe)
640 609
641 @OETestID(1281)
642 def test_recipetool_appendsrcfile_subdir_basic(self): 610 def test_recipetool_appendsrcfile_subdir_basic(self):
643 self._test_appendsrcfile('base-files', 'a-file', 'tmp') 611 self._test_appendsrcfile('base-files', 'a-file', 'tmp')
644 612
645 @OETestID(1282)
646 def test_recipetool_appendsrcfile_subdir_basic_dirdest(self): 613 def test_recipetool_appendsrcfile_subdir_basic_dirdest(self):
647 self._test_appendsrcfile('base-files', destdir='tmp') 614 self._test_appendsrcfile('base-files', destdir='tmp')
648 615
649 @OETestID(1280)
650 def test_recipetool_appendsrcfile_srcdir_basic(self): 616 def test_recipetool_appendsrcfile_srcdir_basic(self):
651 testrecipe = 'bash' 617 testrecipe = 'bash'
652 bb_vars = get_bb_vars(['S', 'WORKDIR'], testrecipe) 618 bb_vars = get_bb_vars(['S', 'WORKDIR'], testrecipe)
@@ -655,14 +621,12 @@ class RecipetoolAppendsrcTests(RecipetoolAppendsrcBase):
655 subdir = os.path.relpath(srcdir, workdir) 621 subdir = os.path.relpath(srcdir, workdir)
656 self._test_appendsrcfile(testrecipe, 'a-file', srcdir=subdir) 622 self._test_appendsrcfile(testrecipe, 'a-file', srcdir=subdir)
657 623
658 @OETestID(1275)
659 def test_recipetool_appendsrcfile_existing_in_src_uri(self): 624 def test_recipetool_appendsrcfile_existing_in_src_uri(self):
660 testrecipe = 'base-files' 625 testrecipe = 'base-files'
661 filepath = self._get_first_file_uri(testrecipe) 626 filepath = self._get_first_file_uri(testrecipe)
662 self.assertTrue(filepath, 'Unable to test, no file:// uri found in SRC_URI for %s' % testrecipe) 627 self.assertTrue(filepath, 'Unable to test, no file:// uri found in SRC_URI for %s' % testrecipe)
663 self._test_appendsrcfile(testrecipe, filepath, has_src_uri=False) 628 self._test_appendsrcfile(testrecipe, filepath, has_src_uri=False)
664 629
665 @OETestID(1276)
666 def test_recipetool_appendsrcfile_existing_in_src_uri_diff_params(self): 630 def test_recipetool_appendsrcfile_existing_in_src_uri_diff_params(self):
667 testrecipe = 'base-files' 631 testrecipe = 'base-files'
668 subdir = 'tmp' 632 subdir = 'tmp'
@@ -672,7 +636,6 @@ class RecipetoolAppendsrcTests(RecipetoolAppendsrcBase):
672 output = self._test_appendsrcfile(testrecipe, filepath, subdir, has_src_uri=False) 636 output = self._test_appendsrcfile(testrecipe, filepath, subdir, has_src_uri=False)
673 self.assertTrue(any('with different parameters' in l for l in output)) 637 self.assertTrue(any('with different parameters' in l for l in output))
674 638
675 @OETestID(1277)
676 def test_recipetool_appendsrcfile_replace_file_srcdir(self): 639 def test_recipetool_appendsrcfile_replace_file_srcdir(self):
677 testrecipe = 'bash' 640 testrecipe = 'bash'
678 filepath = 'Makefile.in' 641 filepath = 'Makefile.in'
@@ -685,7 +648,6 @@ class RecipetoolAppendsrcTests(RecipetoolAppendsrcBase):
685 bitbake('%s:do_unpack' % testrecipe) 648 bitbake('%s:do_unpack' % testrecipe)
686 self.assertEqual(open(self.testfile, 'r').read(), open(os.path.join(srcdir, filepath), 'r').read()) 649 self.assertEqual(open(self.testfile, 'r').read(), open(os.path.join(srcdir, filepath), 'r').read())
687 650
688 @OETestID(1278)
689 def test_recipetool_appendsrcfiles_basic(self, destdir=None): 651 def test_recipetool_appendsrcfiles_basic(self, destdir=None):
690 newfiles = [self.testfile] 652 newfiles = [self.testfile]
691 for i in range(1, 5): 653 for i in range(1, 5):
@@ -695,6 +657,5 @@ class RecipetoolAppendsrcTests(RecipetoolAppendsrcBase):
695 newfiles.append(testfile) 657 newfiles.append(testfile)
696 self._test_appendsrcfiles('gcc', newfiles, destdir=destdir, options='-W') 658 self._test_appendsrcfiles('gcc', newfiles, destdir=destdir, options='-W')
697 659
698 @OETestID(1279)
699 def test_recipetool_appendsrcfiles_basic_subdir(self): 660 def test_recipetool_appendsrcfiles_basic_subdir(self):
700 self.test_recipetool_appendsrcfiles_basic(destdir='testdir') 661 self.test_recipetool_appendsrcfiles_basic(destdir='testdir')
diff --git a/meta/lib/oeqa/selftest/cases/recipeutils.py b/meta/lib/oeqa/selftest/cases/recipeutils.py
index dd2f55839a..408eb356bf 100644
--- a/meta/lib/oeqa/selftest/cases/recipeutils.py
+++ b/meta/lib/oeqa/selftest/cases/recipeutils.py
@@ -6,7 +6,6 @@ import bb.tinfoil
6 6
7from oeqa.selftest.case import OESelftestTestCase 7from oeqa.selftest.case import OESelftestTestCase
8from oeqa.utils.commands import runCmd, get_test_layer 8from oeqa.utils.commands import runCmd, get_test_layer
9from oeqa.core.decorator.oeid import OETestID
10 9
11 10
12def setUpModule(): 11def setUpModule():
diff --git a/meta/lib/oeqa/selftest/cases/runcmd.py b/meta/lib/oeqa/selftest/cases/runcmd.py
index a1615cfd20..ed4ba8a465 100644
--- a/meta/lib/oeqa/selftest/cases/runcmd.py
+++ b/meta/lib/oeqa/selftest/cases/runcmd.py
@@ -1,7 +1,6 @@
1from oeqa.selftest.case import OESelftestTestCase 1from oeqa.selftest.case import OESelftestTestCase
2from oeqa.utils.commands import runCmd 2from oeqa.utils.commands import runCmd
3from oeqa.utils import CommandError 3from oeqa.utils import CommandError
4from oeqa.core.decorator.oeid import OETestID
5 4
6import subprocess 5import subprocess
7import threading 6import threading
@@ -27,60 +26,49 @@ class RunCmdTests(OESelftestTestCase):
27 TIMEOUT = 5 26 TIMEOUT = 5
28 DELTA = 3 27 DELTA = 3
29 28
30 @OETestID(1916)
31 def test_result_okay(self): 29 def test_result_okay(self):
32 result = runCmd("true") 30 result = runCmd("true")
33 self.assertEqual(result.status, 0) 31 self.assertEqual(result.status, 0)
34 32
35 @OETestID(1915)
36 def test_result_false(self): 33 def test_result_false(self):
37 result = runCmd("false", ignore_status=True) 34 result = runCmd("false", ignore_status=True)
38 self.assertEqual(result.status, 1) 35 self.assertEqual(result.status, 1)
39 36
40 @OETestID(1917)
41 def test_shell(self): 37 def test_shell(self):
42 # A shell is used for all string commands. 38 # A shell is used for all string commands.
43 result = runCmd("false; true", ignore_status=True) 39 result = runCmd("false; true", ignore_status=True)
44 self.assertEqual(result.status, 0) 40 self.assertEqual(result.status, 0)
45 41
46 @OETestID(1910)
47 def test_no_shell(self): 42 def test_no_shell(self):
48 self.assertRaises(FileNotFoundError, 43 self.assertRaises(FileNotFoundError,
49 runCmd, "false; true", shell=False) 44 runCmd, "false; true", shell=False)
50 45
51 @OETestID(1906)
52 def test_list_not_found(self): 46 def test_list_not_found(self):
53 self.assertRaises(FileNotFoundError, 47 self.assertRaises(FileNotFoundError,
54 runCmd, ["false; true"]) 48 runCmd, ["false; true"])
55 49
56 @OETestID(1907)
57 def test_list_okay(self): 50 def test_list_okay(self):
58 result = runCmd(["true"]) 51 result = runCmd(["true"])
59 self.assertEqual(result.status, 0) 52 self.assertEqual(result.status, 0)
60 53
61 @OETestID(1913)
62 def test_result_assertion(self): 54 def test_result_assertion(self):
63 self.assertRaisesRegexp(AssertionError, "Command 'echo .* false' returned non-zero exit status 1:\nfoobar", 55 self.assertRaisesRegexp(AssertionError, "Command 'echo .* false' returned non-zero exit status 1:\nfoobar",
64 runCmd, "echo foobar >&2; false", shell=True) 56 runCmd, "echo foobar >&2; false", shell=True)
65 57
66 @OETestID(1914)
67 def test_result_exception(self): 58 def test_result_exception(self):
68 self.assertRaisesRegexp(CommandError, "Command 'echo .* false' returned non-zero exit status 1 with output: foobar", 59 self.assertRaisesRegexp(CommandError, "Command 'echo .* false' returned non-zero exit status 1 with output: foobar",
69 runCmd, "echo foobar >&2; false", shell=True, assert_error=False) 60 runCmd, "echo foobar >&2; false", shell=True, assert_error=False)
70 61
71 @OETestID(1911)
72 def test_output(self): 62 def test_output(self):
73 result = runCmd("echo stdout; echo stderr >&2", shell=True) 63 result = runCmd("echo stdout; echo stderr >&2", shell=True)
74 self.assertEqual("stdout\nstderr", result.output) 64 self.assertEqual("stdout\nstderr", result.output)
75 self.assertEqual("", result.error) 65 self.assertEqual("", result.error)
76 66
77 @OETestID(1912)
78 def test_output_split(self): 67 def test_output_split(self):
79 result = runCmd("echo stdout; echo stderr >&2", shell=True, stderr=subprocess.PIPE) 68 result = runCmd("echo stdout; echo stderr >&2", shell=True, stderr=subprocess.PIPE)
80 self.assertEqual("stdout", result.output) 69 self.assertEqual("stdout", result.output)
81 self.assertEqual("stderr", result.error) 70 self.assertEqual("stderr", result.error)
82 71
83 @OETestID(1920)
84 def test_timeout(self): 72 def test_timeout(self):
85 numthreads = threading.active_count() 73 numthreads = threading.active_count()
86 start = time.time() 74 start = time.time()
@@ -91,7 +79,6 @@ class RunCmdTests(OESelftestTestCase):
91 self.assertLess(end - start, self.TIMEOUT + self.DELTA) 79 self.assertLess(end - start, self.TIMEOUT + self.DELTA)
92 self.assertEqual(numthreads, threading.active_count()) 80 self.assertEqual(numthreads, threading.active_count())
93 81
94 @OETestID(1921)
95 def test_timeout_split(self): 82 def test_timeout_split(self):
96 numthreads = threading.active_count() 83 numthreads = threading.active_count()
97 start = time.time() 84 start = time.time()
@@ -102,14 +89,12 @@ class RunCmdTests(OESelftestTestCase):
102 self.assertLess(end - start, self.TIMEOUT + self.DELTA) 89 self.assertLess(end - start, self.TIMEOUT + self.DELTA)
103 self.assertEqual(numthreads, threading.active_count()) 90 self.assertEqual(numthreads, threading.active_count())
104 91
105 @OETestID(1918)
106 def test_stdin(self): 92 def test_stdin(self):
107 numthreads = threading.active_count() 93 numthreads = threading.active_count()
108 result = runCmd("cat", data=b"hello world", timeout=self.TIMEOUT) 94 result = runCmd("cat", data=b"hello world", timeout=self.TIMEOUT)
109 self.assertEqual("hello world", result.output) 95 self.assertEqual("hello world", result.output)
110 self.assertEqual(numthreads, threading.active_count()) 96 self.assertEqual(numthreads, threading.active_count())
111 97
112 @OETestID(1919)
113 def test_stdin_timeout(self): 98 def test_stdin_timeout(self):
114 numthreads = threading.active_count() 99 numthreads = threading.active_count()
115 start = time.time() 100 start = time.time()
@@ -119,14 +104,12 @@ class RunCmdTests(OESelftestTestCase):
119 self.assertLess(end - start, self.TIMEOUT + self.DELTA) 104 self.assertLess(end - start, self.TIMEOUT + self.DELTA)
120 self.assertEqual(numthreads, threading.active_count()) 105 self.assertEqual(numthreads, threading.active_count())
121 106
122 @OETestID(1908)
123 def test_log(self): 107 def test_log(self):
124 log = MemLogger() 108 log = MemLogger()
125 result = runCmd("echo stdout; echo stderr >&2", shell=True, output_log=log) 109 result = runCmd("echo stdout; echo stderr >&2", shell=True, output_log=log)
126 self.assertEqual(["Running: echo stdout; echo stderr >&2", "stdout", "stderr"], log.info_msgs) 110 self.assertEqual(["Running: echo stdout; echo stderr >&2", "stdout", "stderr"], log.info_msgs)
127 self.assertEqual([], log.error_msgs) 111 self.assertEqual([], log.error_msgs)
128 112
129 @OETestID(1909)
130 def test_log_split(self): 113 def test_log_split(self):
131 log = MemLogger() 114 log = MemLogger()
132 result = runCmd("echo stdout; echo stderr >&2", shell=True, output_log=log, stderr=subprocess.PIPE) 115 result = runCmd("echo stdout; echo stderr >&2", shell=True, output_log=log, stderr=subprocess.PIPE)
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
8import oe.types 8import oe.types
9from oeqa.selftest.case import OESelftestTestCase 9from oeqa.selftest.case import OESelftestTestCase
10from oeqa.utils.commands import bitbake, runqemu, get_bb_var, runCmd 10from oeqa.utils.commands import bitbake, runqemu, get_bb_var, runCmd
11from oeqa.core.decorator.oeid import OETestID
12 11
13class RunqemuTests(OESelftestTestCase): 12class 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)
diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py
index 6c25bb901d..072029ba72 100644
--- a/meta/lib/oeqa/selftest/cases/runtime_test.py
+++ b/meta/lib/oeqa/selftest/cases/runtime_test.py
@@ -1,7 +1,6 @@
1from oeqa.selftest.case import OESelftestTestCase 1from oeqa.selftest.case import OESelftestTestCase
2from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars, runqemu 2from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars, runqemu
3from oeqa.utils.sshcontrol import SSHControl 3from oeqa.utils.sshcontrol import SSHControl
4from oeqa.core.decorator.oeid import OETestID
5import os 4import os
6import re 5import re
7import tempfile 6import tempfile
@@ -15,7 +14,6 @@ class TestExport(OESelftestTestCase):
15 runCmd("rm -rf /tmp/sdk") 14 runCmd("rm -rf /tmp/sdk")
16 super(TestExport, cls).tearDownClass() 15 super(TestExport, cls).tearDownClass()
17 16
18 @OETestID(1499)
19 def test_testexport_basic(self): 17 def test_testexport_basic(self):
20 """ 18 """
21 Summary: Check basic testexport functionality with only ping test enabled. 19 Summary: Check basic testexport functionality with only ping test enabled.
@@ -55,7 +53,6 @@ class TestExport(OESelftestTestCase):
55 # Verify ping test was succesful 53 # Verify ping test was succesful
56 self.assertEqual(0, result.status, 'oe-test runtime returned a non 0 status') 54 self.assertEqual(0, result.status, 'oe-test runtime returned a non 0 status')
57 55
58 @OETestID(1641)
59 def test_testexport_sdk(self): 56 def test_testexport_sdk(self):
60 """ 57 """
61 Summary: Check sdk functionality for testexport. 58 Summary: Check sdk functionality for testexport.
@@ -110,7 +107,6 @@ class TestExport(OESelftestTestCase):
110 107
111class TestImage(OESelftestTestCase): 108class TestImage(OESelftestTestCase):
112 109
113 @OETestID(1644)
114 def test_testimage_install(self): 110 def test_testimage_install(self):
115 """ 111 """
116 Summary: Check install packages functionality for testimage/testexport. 112 Summary: Check install packages functionality for testimage/testexport.
@@ -131,7 +127,6 @@ class TestImage(OESelftestTestCase):
131 bitbake('core-image-full-cmdline socat') 127 bitbake('core-image-full-cmdline socat')
132 bitbake('-c testimage core-image-full-cmdline') 128 bitbake('-c testimage core-image-full-cmdline')
133 129
134 @OETestID(1883)
135 def test_testimage_dnf(self): 130 def test_testimage_dnf(self):
136 """ 131 """
137 Summary: Check package feeds functionality for dnf 132 Summary: Check package feeds functionality for dnf
@@ -169,7 +164,6 @@ class TestImage(OESelftestTestCase):
169 # remove the oeqa-feed-sign temporal directory 164 # remove the oeqa-feed-sign temporal directory
170 shutil.rmtree(self.gpg_home, ignore_errors=True) 165 shutil.rmtree(self.gpg_home, ignore_errors=True)
171 166
172 @OETestID(1883)
173 def test_testimage_virgl_gtk(self): 167 def test_testimage_virgl_gtk(self):
174 """ 168 """
175 Summary: Check host-assisted accelerate OpenGL functionality in qemu with gtk frontend 169 Summary: Check host-assisted accelerate OpenGL functionality in qemu with gtk frontend
@@ -200,7 +194,6 @@ class TestImage(OESelftestTestCase):
200 bitbake('core-image-minimal') 194 bitbake('core-image-minimal')
201 bitbake('-c testimage core-image-minimal') 195 bitbake('-c testimage core-image-minimal')
202 196
203 @OETestID(1883)
204 def test_testimage_virgl_headless(self): 197 def test_testimage_virgl_headless(self):
205 """ 198 """
206 Summary: Check host-assisted accelerate OpenGL functionality in qemu with egl-headless frontend 199 Summary: Check host-assisted accelerate OpenGL functionality in qemu with egl-headless frontend
@@ -235,8 +228,6 @@ class TestImage(OESelftestTestCase):
235 bitbake('-c testimage core-image-minimal') 228 bitbake('-c testimage core-image-minimal')
236 229
237class Postinst(OESelftestTestCase): 230class Postinst(OESelftestTestCase):
238 @OETestID(1540)
239 @OETestID(1545)
240 def test_postinst_rootfs_and_boot(self): 231 def test_postinst_rootfs_and_boot(self):
241 """ 232 """
242 Summary: The purpose of this test case is to verify Post-installation 233 Summary: The purpose of this test case is to verify Post-installation
diff --git a/meta/lib/oeqa/selftest/cases/selftest.py b/meta/lib/oeqa/selftest/cases/selftest.py
index 4b3cb14463..7d3a8ce5f6 100644
--- a/meta/lib/oeqa/selftest/cases/selftest.py
+++ b/meta/lib/oeqa/selftest/cases/selftest.py
@@ -2,11 +2,9 @@ import importlib
2from oeqa.utils.commands import runCmd 2from oeqa.utils.commands import runCmd
3import oeqa.selftest 3import oeqa.selftest
4from oeqa.selftest.case import OESelftestTestCase 4from oeqa.selftest.case import OESelftestTestCase
5from oeqa.core.decorator.oeid import OETestID
6 5
7class ExternalLayer(OESelftestTestCase): 6class ExternalLayer(OESelftestTestCase):
8 7
9 @OETestID(1885)
10 def test_list_imported(self): 8 def test_list_imported(self):
11 """ 9 """
12 Summary: Checks functionality to import tests from other layers. 10 Summary: Checks functionality to import tests from other layers.
diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py
index 4fa99acbc9..cfa87333bc 100644
--- a/meta/lib/oeqa/selftest/cases/signing.py
+++ b/meta/lib/oeqa/selftest/cases/signing.py
@@ -7,7 +7,6 @@ import re
7import shutil 7import shutil
8import tempfile 8import tempfile
9from contextlib import contextmanager 9from contextlib import contextmanager
10from oeqa.core.decorator.oeid import OETestID
11from oeqa.utils.ftools import write_file 10from oeqa.utils.ftools import write_file
12 11
13 12
@@ -51,7 +50,6 @@ class Signing(OESelftestTestCase):
51 os.environ[e] = origenv[e] 50 os.environ[e] = origenv[e]
52 os.chdir(builddir) 51 os.chdir(builddir)
53 52
54 @OETestID(1362)
55 def test_signing_packages(self): 53 def test_signing_packages(self):
56 """ 54 """
57 Summary: Test that packages can be signed in the package feed 55 Summary: Test that packages can be signed in the package feed
@@ -116,7 +114,6 @@ class Signing(OESelftestTestCase):
116 bitbake('core-image-minimal') 114 bitbake('core-image-minimal')
117 115
118 116
119 @OETestID(1382)
120 def test_signing_sstate_archive(self): 117 def test_signing_sstate_archive(self):
121 """ 118 """
122 Summary: Test that sstate archives can be signed 119 Summary: Test that sstate archives can be signed
@@ -169,7 +166,6 @@ class Signing(OESelftestTestCase):
169 166
170class LockedSignatures(OESelftestTestCase): 167class LockedSignatures(OESelftestTestCase):
171 168
172 @OETestID(1420)
173 def test_locked_signatures(self): 169 def test_locked_signatures(self):
174 """ 170 """
175 Summary: Test locked signature mechanism 171 Summary: Test locked signature mechanism
diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py
index 938e654e9a..8cae2f7491 100644
--- a/meta/lib/oeqa/selftest/cases/sstatetests.py
+++ b/meta/lib/oeqa/selftest/cases/sstatetests.py
@@ -7,7 +7,6 @@ import tempfile
7from oeqa.selftest.case import OESelftestTestCase 7from oeqa.selftest.case import OESelftestTestCase
8from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_test_layer, create_temp_layer 8from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_test_layer, create_temp_layer
9from oeqa.selftest.cases.sstate import SStateBase 9from oeqa.selftest.cases.sstate import SStateBase
10from oeqa.core.decorator.oeid import OETestID
11 10
12import bb.siggen 11import bb.siggen
13 12
@@ -73,19 +72,15 @@ class SStateTests(SStateBase):
73 else: 72 else:
74 self.assertTrue(not file_tracker , msg="Found sstate files in the wrong place for: %s (found %s)" % (', '.join(map(str, targets)), str(file_tracker))) 73 self.assertTrue(not file_tracker , msg="Found sstate files in the wrong place for: %s (found %s)" % (', '.join(map(str, targets)), str(file_tracker)))
75 74
76 @OETestID(975)
77 def test_sstate_creation_distro_specific_pass(self): 75 def test_sstate_creation_distro_specific_pass(self):
78 self.run_test_sstate_creation(['binutils-cross-'+ self.tune_arch, 'binutils-native'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True) 76 self.run_test_sstate_creation(['binutils-cross-'+ self.tune_arch, 'binutils-native'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True)
79 77
80 @OETestID(1374)
81 def test_sstate_creation_distro_specific_fail(self): 78 def test_sstate_creation_distro_specific_fail(self):
82 self.run_test_sstate_creation(['binutils-cross-'+ self.tune_arch, 'binutils-native'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True, should_pass=False) 79 self.run_test_sstate_creation(['binutils-cross-'+ self.tune_arch, 'binutils-native'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True, should_pass=False)
83 80
84 @OETestID(976)
85 def test_sstate_creation_distro_nonspecific_pass(self): 81 def test_sstate_creation_distro_nonspecific_pass(self):
86 self.run_test_sstate_creation(['linux-libc-headers'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True) 82 self.run_test_sstate_creation(['linux-libc-headers'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True)
87 83
88 @OETestID(1375)
89 def test_sstate_creation_distro_nonspecific_fail(self): 84 def test_sstate_creation_distro_nonspecific_fail(self):
90 self.run_test_sstate_creation(['linux-libc-headers'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True, should_pass=False) 85 self.run_test_sstate_creation(['linux-libc-headers'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True, should_pass=False)
91 86
@@ -106,17 +101,14 @@ class SStateTests(SStateBase):
106 tgz_removed = self.search_sstate('|'.join(map(str, [s + r'.*?\.tgz$' for s in targets])), distro_specific, distro_nonspecific) 101 tgz_removed = self.search_sstate('|'.join(map(str, [s + r'.*?\.tgz$' for s in targets])), distro_specific, distro_nonspecific)
107 self.assertTrue(not tgz_removed, msg="do_cleansstate didn't remove .tgz sstate files for: %s (%s)" % (', '.join(map(str, targets)), str(tgz_removed))) 102 self.assertTrue(not tgz_removed, msg="do_cleansstate didn't remove .tgz sstate files for: %s (%s)" % (', '.join(map(str, targets)), str(tgz_removed)))
108 103
109 @OETestID(977)
110 def test_cleansstate_task_distro_specific_nonspecific(self): 104 def test_cleansstate_task_distro_specific_nonspecific(self):
111 targets = ['binutils-cross-'+ self.tune_arch, 'binutils-native'] 105 targets = ['binutils-cross-'+ self.tune_arch, 'binutils-native']
112 targets.append('linux-libc-headers') 106 targets.append('linux-libc-headers')
113 self.run_test_cleansstate_task(targets, distro_specific=True, distro_nonspecific=True, temp_sstate_location=True) 107 self.run_test_cleansstate_task(targets, distro_specific=True, distro_nonspecific=True, temp_sstate_location=True)
114 108
115 @OETestID(1376)
116 def test_cleansstate_task_distro_nonspecific(self): 109 def test_cleansstate_task_distro_nonspecific(self):
117 self.run_test_cleansstate_task(['linux-libc-headers'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True) 110 self.run_test_cleansstate_task(['linux-libc-headers'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True)
118 111
119 @OETestID(1377)
120 def test_cleansstate_task_distro_specific(self): 112 def test_cleansstate_task_distro_specific(self):
121 targets = ['binutils-cross-'+ self.tune_arch, 'binutils-native'] 113 targets = ['binutils-cross-'+ self.tune_arch, 'binutils-native']
122 targets.append('linux-libc-headers') 114 targets.append('linux-libc-headers')
@@ -155,15 +147,12 @@ class SStateTests(SStateBase):
155 created_once = [x for x in file_tracker_2 if x not in file_tracker_1] 147 created_once = [x for x in file_tracker_2 if x not in file_tracker_1]
156 self.assertTrue(created_once == [], msg="The following sstate files ware created only in the second run: %s" % ', '.join(map(str, created_once))) 148 self.assertTrue(created_once == [], msg="The following sstate files ware created only in the second run: %s" % ', '.join(map(str, created_once)))
157 149
158 @OETestID(175)
159 def test_rebuild_distro_specific_sstate_cross_native_targets(self): 150 def test_rebuild_distro_specific_sstate_cross_native_targets(self):
160 self.run_test_rebuild_distro_specific_sstate(['binutils-cross-' + self.tune_arch, 'binutils-native'], temp_sstate_location=True) 151 self.run_test_rebuild_distro_specific_sstate(['binutils-cross-' + self.tune_arch, 'binutils-native'], temp_sstate_location=True)
161 152
162 @OETestID(1372)
163 def test_rebuild_distro_specific_sstate_cross_target(self): 153 def test_rebuild_distro_specific_sstate_cross_target(self):
164 self.run_test_rebuild_distro_specific_sstate(['binutils-cross-' + self.tune_arch], temp_sstate_location=True) 154 self.run_test_rebuild_distro_specific_sstate(['binutils-cross-' + self.tune_arch], temp_sstate_location=True)
165 155
166 @OETestID(1373)
167 def test_rebuild_distro_specific_sstate_native_target(self): 156 def test_rebuild_distro_specific_sstate_native_target(self):
168 self.run_test_rebuild_distro_specific_sstate(['binutils-native'], temp_sstate_location=True) 157 self.run_test_rebuild_distro_specific_sstate(['binutils-native'], temp_sstate_location=True)
169 158
@@ -210,7 +199,6 @@ class SStateTests(SStateBase):
210 expected_not_actual = [x for x in expected_remaining_sstate if x not in actual_remaining_sstate] 199 expected_not_actual = [x for x in expected_remaining_sstate if x not in actual_remaining_sstate]
211 self.assertFalse(expected_not_actual, msg="Extra files ware removed: %s" ', '.join(map(str, expected_not_actual))) 200 self.assertFalse(expected_not_actual, msg="Extra files ware removed: %s" ', '.join(map(str, expected_not_actual)))
212 201
213 @OETestID(973)
214 def test_sstate_cache_management_script_using_pr_1(self): 202 def test_sstate_cache_management_script_using_pr_1(self):
215 global_config = [] 203 global_config = []
216 target_config = [] 204 target_config = []
@@ -218,7 +206,6 @@ class SStateTests(SStateBase):
218 target_config.append('PR = "0"') 206 target_config.append('PR = "0"')
219 self.run_test_sstate_cache_management_script('m4', global_config, target_config, ignore_patterns=['populate_lic']) 207 self.run_test_sstate_cache_management_script('m4', global_config, target_config, ignore_patterns=['populate_lic'])
220 208
221 @OETestID(978)
222 def test_sstate_cache_management_script_using_pr_2(self): 209 def test_sstate_cache_management_script_using_pr_2(self):
223 global_config = [] 210 global_config = []
224 target_config = [] 211 target_config = []
@@ -228,7 +215,6 @@ class SStateTests(SStateBase):
228 target_config.append('PR = "1"') 215 target_config.append('PR = "1"')
229 self.run_test_sstate_cache_management_script('m4', global_config, target_config, ignore_patterns=['populate_lic']) 216 self.run_test_sstate_cache_management_script('m4', global_config, target_config, ignore_patterns=['populate_lic'])
230 217
231 @OETestID(979)
232 def test_sstate_cache_management_script_using_pr_3(self): 218 def test_sstate_cache_management_script_using_pr_3(self):
233 global_config = [] 219 global_config = []
234 target_config = [] 220 target_config = []
@@ -240,7 +226,6 @@ class SStateTests(SStateBase):
240 target_config.append('PR = "1"') 226 target_config.append('PR = "1"')
241 self.run_test_sstate_cache_management_script('m4', global_config, target_config, ignore_patterns=['populate_lic']) 227 self.run_test_sstate_cache_management_script('m4', global_config, target_config, ignore_patterns=['populate_lic'])
242 228
243 @OETestID(974)
244 def test_sstate_cache_management_script_using_machine(self): 229 def test_sstate_cache_management_script_using_machine(self):
245 global_config = [] 230 global_config = []
246 target_config = [] 231 target_config = []
@@ -250,7 +235,6 @@ class SStateTests(SStateBase):
250 target_config.append('') 235 target_config.append('')
251 self.run_test_sstate_cache_management_script('m4', global_config, target_config, ignore_patterns=['populate_lic']) 236 self.run_test_sstate_cache_management_script('m4', global_config, target_config, ignore_patterns=['populate_lic'])
252 237
253 @OETestID(1270)
254 def test_sstate_32_64_same_hash(self): 238 def test_sstate_32_64_same_hash(self):
255 """ 239 """
256 The sstate checksums for both native and target should not vary whether 240 The sstate checksums for both native and target should not vary whether
@@ -299,7 +283,6 @@ PACKAGE_CLASSES = "package_rpm package_ipk package_deb"
299 self.assertCountEqual(files1, files2) 283 self.assertCountEqual(files1, files2)
300 284
301 285
302 @OETestID(1271)
303 def test_sstate_nativelsbstring_same_hash(self): 286 def test_sstate_nativelsbstring_same_hash(self):
304 """ 287 """
305 The sstate checksums should be independent of whichever NATIVELSBSTRING is 288 The sstate checksums should be independent of whichever NATIVELSBSTRING is
@@ -333,7 +316,6 @@ NATIVELSBSTRING = \"DistroB\"
333 self.maxDiff = None 316 self.maxDiff = None
334 self.assertCountEqual(files1, files2) 317 self.assertCountEqual(files1, files2)
335 318
336 @OETestID(1368)
337 def test_sstate_allarch_samesigs(self): 319 def test_sstate_allarch_samesigs(self):
338 """ 320 """
339 The sstate checksums of allarch packages should be independent of whichever 321 The sstate checksums of allarch packages should be independent of whichever
@@ -354,7 +336,6 @@ MACHINE = \"qemuarm\"
354""" 336"""
355 self.sstate_allarch_samesigs(configA, configB) 337 self.sstate_allarch_samesigs(configA, configB)
356 338
357 @OETestID(1645)
358 def test_sstate_nativesdk_samesigs_multilib(self): 339 def test_sstate_nativesdk_samesigs_multilib(self):
359 """ 340 """
360 check nativesdk stamps are the same between the two MACHINE values. 341 check nativesdk stamps are the same between the two MACHINE values.
@@ -405,7 +386,6 @@ MULTILIBS = \"\"
405 self.maxDiff = None 386 self.maxDiff = None
406 self.assertEqual(files1, files2) 387 self.assertEqual(files1, files2)
407 388
408 @OETestID(1369)
409 def test_sstate_sametune_samesigs(self): 389 def test_sstate_sametune_samesigs(self):
410 """ 390 """
411 The sstate checksums of two identical machines (using the same tune) should be the 391 The sstate checksums of two identical machines (using the same tune) should be the
@@ -452,7 +432,6 @@ DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
452 self.assertCountEqual(files1, files2) 432 self.assertCountEqual(files1, files2)
453 433
454 434
455 @OETestID(1498)
456 def test_sstate_noop_samesigs(self): 435 def test_sstate_noop_samesigs(self):
457 """ 436 """
458 The sstate checksums of two builds with these variables changed or 437 The sstate checksums of two builds with these variables changed or
diff --git a/meta/lib/oeqa/selftest/cases/tinfoil.py b/meta/lib/oeqa/selftest/cases/tinfoil.py
index f889a47b26..6c246d5306 100644
--- a/meta/lib/oeqa/selftest/cases/tinfoil.py
+++ b/meta/lib/oeqa/selftest/cases/tinfoil.py
@@ -6,12 +6,10 @@ import bb.tinfoil
6 6
7from oeqa.selftest.case import OESelftestTestCase 7from oeqa.selftest.case import OESelftestTestCase
8from oeqa.utils.commands import runCmd 8from oeqa.utils.commands import runCmd
9from oeqa.core.decorator.oeid import OETestID
10 9
11class TinfoilTests(OESelftestTestCase): 10class TinfoilTests(OESelftestTestCase):
12 """ Basic tests for the tinfoil API """ 11 """ Basic tests for the tinfoil API """
13 12
14 @OETestID(1568)
15 def test_getvar(self): 13 def test_getvar(self):
16 with bb.tinfoil.Tinfoil() as tinfoil: 14 with bb.tinfoil.Tinfoil() as tinfoil:
17 tinfoil.prepare(True) 15 tinfoil.prepare(True)
@@ -19,7 +17,6 @@ class TinfoilTests(OESelftestTestCase):
19 if not machine: 17 if not machine:
20 self.fail('Unable to get MACHINE value - returned %s' % machine) 18 self.fail('Unable to get MACHINE value - returned %s' % machine)
21 19
22 @OETestID(1569)
23 def test_expand(self): 20 def test_expand(self):
24 with bb.tinfoil.Tinfoil() as tinfoil: 21 with bb.tinfoil.Tinfoil() as tinfoil:
25 tinfoil.prepare(True) 22 tinfoil.prepare(True)
@@ -28,7 +25,6 @@ class TinfoilTests(OESelftestTestCase):
28 if not pid: 25 if not pid:
29 self.fail('Unable to expand "%s" - returned %s' % (expr, pid)) 26 self.fail('Unable to expand "%s" - returned %s' % (expr, pid))
30 27
31 @OETestID(1570)
32 def test_getvar_bb_origenv(self): 28 def test_getvar_bb_origenv(self):
33 with bb.tinfoil.Tinfoil() as tinfoil: 29 with bb.tinfoil.Tinfoil() as tinfoil:
34 tinfoil.prepare(True) 30 tinfoil.prepare(True)
@@ -37,7 +33,6 @@ class TinfoilTests(OESelftestTestCase):
37 self.fail('Unable to get BB_ORIGENV value - returned %s' % origenv) 33 self.fail('Unable to get BB_ORIGENV value - returned %s' % origenv)
38 self.assertEqual(origenv.getVar('HOME', False), os.environ['HOME']) 34 self.assertEqual(origenv.getVar('HOME', False), os.environ['HOME'])
39 35
40 @OETestID(1571)
41 def test_parse_recipe(self): 36 def test_parse_recipe(self):
42 with bb.tinfoil.Tinfoil() as tinfoil: 37 with bb.tinfoil.Tinfoil() as tinfoil:
43 tinfoil.prepare(config_only=False, quiet=2) 38 tinfoil.prepare(config_only=False, quiet=2)
@@ -48,7 +43,6 @@ class TinfoilTests(OESelftestTestCase):
48 rd = tinfoil.parse_recipe_file(best[3]) 43 rd = tinfoil.parse_recipe_file(best[3])
49 self.assertEqual(testrecipe, rd.getVar('PN')) 44 self.assertEqual(testrecipe, rd.getVar('PN'))
50 45
51 @OETestID(1572)
52 def test_parse_recipe_copy_expand(self): 46 def test_parse_recipe_copy_expand(self):
53 with bb.tinfoil.Tinfoil() as tinfoil: 47 with bb.tinfoil.Tinfoil() as tinfoil:
54 tinfoil.prepare(config_only=False, quiet=2) 48 tinfoil.prepare(config_only=False, quiet=2)
@@ -67,7 +61,6 @@ class TinfoilTests(OESelftestTestCase):
67 localdata.setVar('PN', 'hello') 61 localdata.setVar('PN', 'hello')
68 self.assertEqual('hello', localdata.getVar('BPN')) 62 self.assertEqual('hello', localdata.getVar('BPN'))
69 63
70 @OETestID(1573)
71 def test_parse_recipe_initial_datastore(self): 64 def test_parse_recipe_initial_datastore(self):
72 with bb.tinfoil.Tinfoil() as tinfoil: 65 with bb.tinfoil.Tinfoil() as tinfoil:
73 tinfoil.prepare(config_only=False, quiet=2) 66 tinfoil.prepare(config_only=False, quiet=2)
@@ -81,7 +74,6 @@ class TinfoilTests(OESelftestTestCase):
81 # Check we can get variable values 74 # Check we can get variable values
82 self.assertEqual('somevalue', rd.getVar('MYVARIABLE')) 75 self.assertEqual('somevalue', rd.getVar('MYVARIABLE'))
83 76
84 @OETestID(1574)
85 def test_list_recipes(self): 77 def test_list_recipes(self):
86 with bb.tinfoil.Tinfoil() as tinfoil: 78 with bb.tinfoil.Tinfoil() as tinfoil:
87 tinfoil.prepare(config_only=False, quiet=2) 79 tinfoil.prepare(config_only=False, quiet=2)
@@ -100,7 +92,6 @@ class TinfoilTests(OESelftestTestCase):
100 if checkpns: 92 if checkpns:
101 self.fail('Unable to find pkg_fn entries for: %s' % ', '.join(checkpns)) 93 self.fail('Unable to find pkg_fn entries for: %s' % ', '.join(checkpns))
102 94
103 @OETestID(1575)
104 def test_wait_event(self): 95 def test_wait_event(self):
105 with bb.tinfoil.Tinfoil() as tinfoil: 96 with bb.tinfoil.Tinfoil() as tinfoil:
106 tinfoil.prepare(config_only=True) 97 tinfoil.prepare(config_only=True)
@@ -136,7 +127,6 @@ class TinfoilTests(OESelftestTestCase):
136 self.assertTrue(commandcomplete, 'Timed out waiting for CommandCompleted event from bitbake server') 127 self.assertTrue(commandcomplete, 'Timed out waiting for CommandCompleted event from bitbake server')
137 self.assertTrue(eventreceived, 'Did not receive FilesMatchingFound event from bitbake server') 128 self.assertTrue(eventreceived, 'Did not receive FilesMatchingFound event from bitbake server')
138 129
139 @OETestID(1576)
140 def test_setvariable_clean(self): 130 def test_setvariable_clean(self):
141 # First check that setVariable affects the datastore 131 # First check that setVariable affects the datastore
142 with bb.tinfoil.Tinfoil() as tinfoil: 132 with bb.tinfoil.Tinfoil() as tinfoil:
@@ -159,7 +149,6 @@ class TinfoilTests(OESelftestTestCase):
159 value = tinfoil.run_command('getVariable', 'TESTVAR') 149 value = tinfoil.run_command('getVariable', 'TESTVAR')
160 self.assertEqual(value, 'specialvalue', 'Value set using config_data.setVar() is not reflected in config_data.getVar()') 150 self.assertEqual(value, 'specialvalue', 'Value set using config_data.setVar() is not reflected in config_data.getVar()')
161 151
162 @OETestID(1884)
163 def test_datastore_operations(self): 152 def test_datastore_operations(self):
164 with bb.tinfoil.Tinfoil() as tinfoil: 153 with bb.tinfoil.Tinfoil() as tinfoil:
165 tinfoil.prepare(config_only=True) 154 tinfoil.prepare(config_only=True)
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
35from oeqa.selftest.case import OESelftestTestCase 35from oeqa.selftest.case import OESelftestTestCase
36from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars, runqemu 36from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars, runqemu
37from 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
104class Wic(WicTestCase): 103class 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
526class Wic2(WicTestCase): 487class 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'
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 18:56:46 +0000