diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-05 22:38:39 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-07 08:52:55 +0100 |
commit | c1d72abe5eadd0065303d7d515a429ef1cd1832b (patch) | |
tree | 70c904ea94c4dcf787f25b4a094c5b9a602abcfb /meta | |
parent | 21a9066b1b0934e21d58ab088c600dd2797e2050 (diff) | |
download | poky-c1d72abe5eadd0065303d7d515a429ef1cd1832b.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: 0a77f4b680332a692abf0231e397fab44c59bde3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oeqa/runtime/cases/dnf.py | 2 |
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 7da31cbf88..67484bc9f9 100644 --- a/meta/lib/oeqa/runtime/cases/dnf.py +++ b/meta/lib/oeqa/runtime/cases/dnf.py | |||
@@ -157,7 +157,7 @@ class DnfRepoTest(DnfTest): | |||
157 | #check curl-dev is not installed adter removing all curl occurrences | 157 | #check curl-dev is not installed adter removing all curl occurrences |
158 | status, output = self.target.run('dnf list --installed | grep %s'% excludepkg, 1500) | 158 | status, output = self.target.run('dnf list --installed | grep %s'% excludepkg, 1500) |
159 | self.assertEqual(1, status, "%s was not removed, is listed as installed"%excludepkg) | 159 | self.assertEqual(1, status, "%s was not removed, is listed as installed"%excludepkg) |
160 | self.dnf_with_repo('install -y --exclude=%s curl*' % excludepkg) | 160 | self.dnf_with_repo('install -y --exclude=%s --exclude=curl-staticdev curl*' % excludepkg) |
161 | #check curl-dev is not installed after being excluded | 161 | #check curl-dev is not installed after being excluded |
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 excluded, is listed as installed"%excludepkg) | 163 | self.assertEqual(1, status, "%s was not excluded, is listed as installed"%excludepkg) |