From: Jose Perez Carranza <jose.perez.carra...@linux.intel.com>
Add test cases to test “exclude” and “installroot“ options, also modify
the logic of filtering packages on the feed to have all the packages
needed by the tests.
[YOCTO #10744]
Signed-off-by: Jose Perez Carranza <jose.perez.carra...@linux.intel.com>
---
meta/classes/testimage.bbclass | 11 ++++++++---
meta/lib/oeqa/runtime/cases/dnf.py | 16 +++++++++++++++-
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index fb214604a97..2ae2eed053c 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -329,6 +329,7 @@ def create_index(arg):
return None
def create_rpm_index(d):
+ import glob
# Index RPMs
rpm_createrepo = bb.utils.which(os.getenv('PATH'), "createrepo_c")
index_cmds = []
@@ -345,9 +346,13 @@ def create_rpm_index(d):
lf = bb.utils.lockfile(lockfilename, False)
oe.path.copyhardlinktree(rpm_dir, idx_path)
# Full indexes overload a 256MB image so reduce the number of rpms
- # in the feed. Filter to r* since we use the run-postinst packages and
- # this leaves some allarch and machine arch packages too.
- bb.utils.remove(idx_path + "*/[a-qs-z]*.rpm")
+ # in the feed by filtering to specific packages needed by the tests.
+ package_list = glob.glob(idx_path + "*/*.rpm")
+
+ for pkg in package_list:
+ if not os.path.basename(pkg).startswith(("rpm", "run-postinsts",
"busybox", "bash", "update-alternatives", "libc6")):
+ bb.utils.remove(pkg)
+
bb.utils.unlockfile(lf)
cmd = '%s --update -q %s' % (rpm_createrepo, idx_path)
diff --git a/meta/lib/oeqa/runtime/cases/dnf.py
b/meta/lib/oeqa/runtime/cases/dnf.py
index 2f87296b4e0..4ca4850ed1d 100644
--- a/meta/lib/oeqa/runtime/cases/dnf.py
+++ b/meta/lib/oeqa/runtime/cases/dnf.py
@@ -120,4 +120,18 @@ class DnfRepoTest(DnfTest):
def test_dnf_reinstall(self):
self.dnf_with_repo('reinstall -y run-postinsts-dev')
-
+ @OETestDepends(['dnf.DnfRepoTest.test_dnf_makecache'])
+ @OETestID(1771)
+ def test_dnf_installroot(self):
+ rootpath = '/home/root/chroot/test'
+ self.dnf_with_repo('install --installroot=%s --allowerasing -v -y
busybox run-postinsts' % rootpath)
+ status, output = self.target.run('test -e %s/var/cache/dnf' %
rootpath, 1500)
+ self.assertEqual(0, status, output)
+
+ @OETestDepends(['dnf.DnfRepoTest.test_dnf_reinstall'])
+ @OETestID(1772)
+ def test_dnf_exclude(self):
+ excludepkg = 'run-postinsts-dev'
+ self.dnf_with_repo('remove -y run-postinsts')
+ self.dnf_with_repo('install -y --exclude=%s run-postinsts' %
excludepkg)
+ self.dnf('list %s' % excludepkg, 1)
--
2.11.0
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
