oeqa/dnf.py/rpm.py: add MLPREFIX to package name

The package name is lib32-foo (e.g., lib32-dnf) when run
"bitbake lib32-core-image-sato -ctestimage", add MLPREFIX to package name can
fix the problem, otherwise the test cases would be failed.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>

diff --git a/meta/lib/oeqa/runtime/cases/dnf.py b/meta/lib/oeqa/runtime/cases/dnf.py
index 2f87296b4e01d129ac9ce2bd882fae474fe6ea6b..7912ad26f9cfb59c044fb250f9e7781a7af1841b 100644 (file)
--- a/meta/lib/oeqa/runtime/cases/dnf.py
+++ b/meta/lib/oeqa/runtime/cases/dnf.py
@@ -38,12 +38,12 @@ class DnfBasicTest(DnfTest):
     @OETestDepends(['dnf.DnfBasicTest.test_dnf_help'])
     @OETestID(1737)
     def test_dnf_info(self):
-        self.dnf('info dnf')
+        self.dnf('info %sdnf' % self.tc.td['MLPREFIX'])
 
     @OETestDepends(['dnf.DnfBasicTest.test_dnf_help'])
     @OETestID(1738)
     def test_dnf_search(self):
-        self.dnf('search dnf')
+        self.dnf('search %sdnf' % self.tc.td['MLPREFIX'])
 
     @OETestDepends(['dnf.DnfBasicTest.test_dnf_help'])
     @OETestID(1736)

diff --git a/meta/lib/oeqa/runtime/cases/rpm.py b/meta/lib/oeqa/runtime/cases/rpm.py
index 05b94c7b40e20837dd62d940e18b036e550ed8f4..137739de6dae1836ed46f513ca80676e86ca6255 100644 (file)
--- a/meta/lib/oeqa/runtime/cases/rpm.py
+++ b/meta/lib/oeqa/runtime/cases/rpm.py
@@ -25,7 +25,7 @@ class RpmBasicTest(OERuntimeTestCase):
     @OETestID(191)
     @OETestDepends(['rpm.RpmBasicTest.test_rpm_help'])
     def test_rpm_query(self):
-        status, output = self.target.run('rpm -q rpm')
+        status, output = self.target.run('rpm -q %srpm' % self.tc.td['MLPREFIX'])
         msg = 'status and output: %s and %s' % (status, output)
         self.assertEqual(status, 0, msg=msg)