diff options
Diffstat (limited to 'meta/lib/oeqa/selftest/cases/containerimage.py')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/containerimage.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/meta/lib/oeqa/selftest/cases/containerimage.py b/meta/lib/oeqa/selftest/cases/containerimage.py index 79cc8a0f2e..d1ac305a84 100644 --- a/meta/lib/oeqa/selftest/cases/containerimage.py +++ b/meta/lib/oeqa/selftest/cases/containerimage.py | |||
@@ -1,4 +1,6 @@ | |||
1 | # | 1 | # |
2 | # Copyright OpenEmbedded Contributors | ||
3 | # | ||
2 | # SPDX-License-Identifier: MIT | 4 | # SPDX-License-Identifier: MIT |
3 | # | 5 | # |
4 | 6 | ||
@@ -13,7 +15,7 @@ from oeqa.utils.commands import bitbake, get_bb_vars, runCmd | |||
13 | # The only package added to the image is container_image_testpkg, which | 15 | # The only package added to the image is container_image_testpkg, which |
14 | # contains one file. However, due to some other things not cleaning up during | 16 | # contains one file. However, due to some other things not cleaning up during |
15 | # rootfs creation, there is some cruft. Ideally bugs will be filed and the | 17 | # rootfs creation, there is some cruft. Ideally bugs will be filed and the |
16 | # cruft removed, but for now we whitelist some known set. | 18 | # cruft removed, but for now we ignore some known set. |
17 | # | 19 | # |
18 | # Also for performance reasons we're only checking the cruft when using ipk. | 20 | # Also for performance reasons we're only checking the cruft when using ipk. |
19 | # When using deb, and rpm it is a bit different and we could test all | 21 | # When using deb, and rpm it is a bit different and we could test all |
@@ -22,7 +24,7 @@ from oeqa.utils.commands import bitbake, get_bb_vars, runCmd | |||
22 | # | 24 | # |
23 | class ContainerImageTests(OESelftestTestCase): | 25 | class ContainerImageTests(OESelftestTestCase): |
24 | 26 | ||
25 | # Verify that when specifying a IMAGE_TYPEDEP_ of the form "foo.bar" that | 27 | # Verify that when specifying a IMAGE_TYPEDEP: of the form "foo.bar" that |
26 | # the conversion type bar gets added as a dep as well | 28 | # the conversion type bar gets added as a dep as well |
27 | def test_expected_files(self): | 29 | def test_expected_files(self): |
28 | 30 | ||
@@ -40,10 +42,9 @@ class ContainerImageTests(OESelftestTestCase): | |||
40 | self.write_config("""PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" | 42 | self.write_config("""PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" |
41 | IMAGE_FSTYPES = "container" | 43 | IMAGE_FSTYPES = "container" |
42 | PACKAGE_CLASSES = "package_ipk" | 44 | PACKAGE_CLASSES = "package_ipk" |
43 | IMAGE_FEATURES = "" | ||
44 | IMAGE_BUILDINFO_FILE = "" | 45 | IMAGE_BUILDINFO_FILE = "" |
45 | INIT_MANAGER = "sysvinit" | 46 | INIT_MANAGER = "sysvinit" |
46 | IMAGE_INSTALL_remove = "ssh-pregen-hostkeys" | 47 | IMAGE_INSTALL:remove = "ssh-pregen-hostkeys" |
47 | 48 | ||
48 | """) | 49 | """) |
49 | 50 | ||
@@ -53,8 +54,6 @@ IMAGE_INSTALL_remove = "ssh-pregen-hostkeys" | |||
53 | expected_files = [ | 54 | expected_files = [ |
54 | './', | 55 | './', |
55 | '.{bindir}/theapp', | 56 | '.{bindir}/theapp', |
56 | '.{sysconfdir}/default/', | ||
57 | '.{sysconfdir}/default/postinst', | ||
58 | '.{sysconfdir}/ld.so.cache', | 57 | '.{sysconfdir}/ld.so.cache', |
59 | '.{sysconfdir}/timestamp', | 58 | '.{sysconfdir}/timestamp', |
60 | '.{sysconfdir}/version', | 59 | '.{sysconfdir}/version', |