diff options
| author | Stefan Stanacar <stefanx.stanacar@intel.com> | 2013-08-28 12:56:45 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-28 23:35:56 +0100 |
| commit | 188acd0a75e188fd7c0d2979acaf13fd18b12106 (patch) | |
| tree | 90fff07d8f456fe88a8e3474a86d67a1c3da422c | |
| parent | 3f8d61517d31c3351a45f95adbd81e1c0147b98e (diff) | |
| download | openembedded-core-188acd0a75e188fd7c0d2979acaf13fd18b12106.tar.gz openembedded-core-188acd0a75e188fd7c0d2979acaf13fd18b12106.tar.bz2 openembedded-core-188acd0a75e188fd7c0d2979acaf13fd18b12106.zip | |
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).
Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/lib/oeqa/runtime/date.py | 3 | ||||
| -rw-r--r-- | meta/lib/oeqa/runtime/df.py | 2 | ||||
| -rw-r--r-- | meta/lib/oeqa/runtime/dmesg.py | 2 | ||||
| -rw-r--r-- | meta/lib/oeqa/runtime/vnc.py | 2 |
4 files changed, 1 insertions, 8 deletions
diff --git a/meta/lib/oeqa/runtime/date.py b/meta/lib/oeqa/runtime/date.py index d6c04cb0f7..3b35964763 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 c9119898dc..b6da35027c 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 48370fbb0c..a53d1f0bf3 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 9476184080..ce111793b8 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): |