summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-05 22:38:39 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-24 16:49:54 +0000
commit0a8f50fd31459834061117a1b5f0a341836e1e8b (patch)
treee8f00ce6018323df18582b1cc13dd8f0fd734bee /meta
parentb4daa5ba9679d21d0eff7b9ab102c7f26f56e2f9 (diff)
downloadpoky-0a8f50fd31459834061117a1b5f0a341836e1e8b.tar.gz
oeqa/runtime/dnf: Fix test error when static libs are enabled
The test works by excluding curl-dev which curl-staticdev depends upon. When static libraries aren't disabled, this leads to an odd looking test failure. Simply exclude curl-staticdev as well in case its enabled to make sure the test always works. (From OE-Core rev: dfded083d9456c8d2bb168dbe8e08b2ffb3e1a26) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/runtime/cases/dnf.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/runtime/cases/dnf.py b/meta/lib/oeqa/runtime/cases/dnf.py
index ef81a8cb7d..c1ed39d776 100644
--- a/meta/lib/oeqa/runtime/cases/dnf.py
+++ b/meta/lib/oeqa/runtime/cases/dnf.py
@@ -161,7 +161,7 @@ class DnfRepoTest(DnfTest):
161 #check curl-dev is not installed adter removing all curl occurrences 161 #check curl-dev is not installed adter removing all curl occurrences
162 status, output = self.target.run('dnf list --installed | grep %s'% excludepkg, 1500) 162 status, output = self.target.run('dnf list --installed | grep %s'% excludepkg, 1500)
163 self.assertEqual(1, status, "%s was not removed, is listed as installed"%excludepkg) 163 self.assertEqual(1, status, "%s was not removed, is listed as installed"%excludepkg)
164 self.dnf_with_repo('install -y --exclude=%s curl*' % excludepkg) 164 self.dnf_with_repo('install -y --exclude=%s --exclude=curl-staticdev curl*' % excludepkg)
165 #check curl-dev is not installed after being excluded 165 #check curl-dev is not installed after being excluded
166 status, output = self.target.run('dnf list --installed | grep %s'% excludepkg , 1500) 166 status, output = self.target.run('dnf list --installed | grep %s'% excludepkg , 1500)
167 self.assertEqual(1, status, "%s was not excluded, is listed as installed"%excludepkg) 167 self.assertEqual(1, status, "%s was not excluded, is listed as installed"%excludepkg)