diff options
Diffstat (limited to 'meta/lib/oeqa/runtime/_ptest.py')
-rw-r--r-- | meta/lib/oeqa/runtime/_ptest.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/runtime/_ptest.py b/meta/lib/oeqa/runtime/_ptest.py index 0621028b86..71324d3da2 100644 --- a/meta/lib/oeqa/runtime/_ptest.py +++ b/meta/lib/oeqa/runtime/_ptest.py | |||
@@ -11,7 +11,7 @@ import subprocess | |||
11 | def setUpModule(): | 11 | def setUpModule(): |
12 | if not oeRuntimeTest.hasFeature("package-management"): | 12 | if not oeRuntimeTest.hasFeature("package-management"): |
13 | skipModule("Image doesn't have package management feature") | 13 | skipModule("Image doesn't have package management feature") |
14 | if not oeRuntimeTest.hasPackage("smart"): | 14 | if not oeRuntimeTest.hasPackage("smartpm"): |
15 | skipModule("Image doesn't have smart installed") | 15 | skipModule("Image doesn't have smart installed") |
16 | if "package_rpm" != oeRuntimeTest.tc.d.getVar("PACKAGE_CLASSES", True).split()[0]: | 16 | if "package_rpm" != oeRuntimeTest.tc.d.getVar("PACKAGE_CLASSES", True).split()[0]: |
17 | skipModule("Rpm is not the primary package manager") | 17 | skipModule("Rpm is not the primary package manager") |
@@ -105,7 +105,7 @@ class PtestRunnerTest(oeRuntimeTest): | |||
105 | def test_ptestrunner(self): | 105 | def test_ptestrunner(self): |
106 | self.add_smart_channel() | 106 | self.add_smart_channel() |
107 | (runnerstatus, result) = self.target.run('which ptest-runner', 0) | 107 | (runnerstatus, result) = self.target.run('which ptest-runner', 0) |
108 | cond = oeRuntimeTest.hasPackage("ptest-runner") and oeRuntimeTest.hasFeature("ptest") and oeRuntimeTest.hasPackage("-ptest") and (runnerstatus != 0) | 108 | cond = oeRuntimeTest.hasPackage("ptest-runner") and oeRuntimeTest.hasFeature("ptest") and oeRuntimeTest.hasPackageMatch("-ptest") and (runnerstatus != 0) |
109 | if cond: | 109 | if cond: |
110 | self.install_packages(self.install_complementary("*-ptest")) | 110 | self.install_packages(self.install_complementary("*-ptest")) |
111 | self.install_packages(['ptest-runner']) | 111 | self.install_packages(['ptest-runner']) |