summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorStefan Stanacar <stefanx.stanacar@intel.com>2013-08-28 12:56:45 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-28 23:36:08 +0100
commit4e62e9cb7655669c8e4048e678d8858f8b9f5214 (patch)
tree22b826d21a33d93f12cfe949db80b8a5a6325503 /meta
parenta79afb3c913f90966a05f7dcc9059e0657f247fc (diff)
downloadast2050-yocto-poky-4e62e9cb7655669c8e4048e678d8858f8b9f5214.zip
ast2050-yocto-poky-4e62e9cb7655669c8e4048e678d8858f8b9f5214.tar.gz
lib/oeqa/runtime: remove some unnecessary checks from setUpModule
These checks are unnecessary. setUpModule is run when a module is loaded and we shouldn't run commands on the target here, (plus if ssh doesn't work we error out in setup multiple times, instead of skipping the real test, which might depend on test_ssh). (From OE-Core rev: 188acd0a75e188fd7c0d2979acaf13fd18b12106) Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/runtime/date.py3
-rw-r--r--meta/lib/oeqa/runtime/df.py2
-rw-r--r--meta/lib/oeqa/runtime/dmesg.py2
-rw-r--r--meta/lib/oeqa/runtime/vnc.py2
4 files changed, 1 insertions, 8 deletions
diff --git a/meta/lib/oeqa/runtime/date.py b/meta/lib/oeqa/runtime/date.py
index d6c04cb..3b35964 100644
--- a/meta/lib/oeqa/runtime/date.py
+++ b/meta/lib/oeqa/runtime/date.py
@@ -2,9 +2,6 @@ from oeqa.oetest import oeRuntimeTest
from oeqa.utils.decorators import *
import re
-def setUpModule():
- skipModuleUnless(oeRuntimeTest.tc.target.run('which date')[0] == 0, "No date in image or no connection")
-
class DateTest(oeRuntimeTest):
def setUp(self):
diff --git a/meta/lib/oeqa/runtime/df.py b/meta/lib/oeqa/runtime/df.py
index c911989..b6da350 100644
--- a/meta/lib/oeqa/runtime/df.py
+++ b/meta/lib/oeqa/runtime/df.py
@@ -2,8 +2,6 @@ import unittest
from oeqa.oetest import oeRuntimeTest
from oeqa.utils.decorators import *
-def setUpModule():
- skipModuleUnless(oeRuntimeTest.tc.target.run('which df')[0] == 0, "No df in image or no connection")
class DfTest(oeRuntimeTest):
diff --git a/meta/lib/oeqa/runtime/dmesg.py b/meta/lib/oeqa/runtime/dmesg.py
index 48370fb..a53d1f0 100644
--- a/meta/lib/oeqa/runtime/dmesg.py
+++ b/meta/lib/oeqa/runtime/dmesg.py
@@ -2,8 +2,6 @@ import unittest
from oeqa.oetest import oeRuntimeTest
from oeqa.utils.decorators import *
-def setUpModule():
- skipModuleUnless(oeRuntimeTest.tc.target.run('which dmesg')[0] == 0, "No dmesg in image or no connection")
class DmesgTest(oeRuntimeTest):
diff --git a/meta/lib/oeqa/runtime/vnc.py b/meta/lib/oeqa/runtime/vnc.py
index 9476184..ce11179 100644
--- a/meta/lib/oeqa/runtime/vnc.py
+++ b/meta/lib/oeqa/runtime/vnc.py
@@ -3,7 +3,7 @@ from oeqa.utils.decorators import *
import re
def setUpModule():
- skipModuleUnless(oeRuntimeTest.tc.target.run('which x11vnc')[0] == 0, "No x11vnc in image")
+ skipModuleUnless(oeRuntimeTest.hasPackage('x11vnc'), "No x11vnc package in image")
class VNCTest(oeRuntimeTest):
OpenPOWER on IntegriCloud