From: Stefan Stanacar <stefanx.stanacar@intel.com>
Date: Wed, 28 Aug 2013 09:56:45 +0000 (+0300)
Subject: lib/oeqa/runtime: remove some unnecessary checks from setUpModule
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~36174
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=188acd0a75e188fd7c0d2979acaf13fd18b12106;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

diff --git a/meta/lib/oeqa/runtime/date.py b/meta/lib/oeqa/runtime/date.py
index d6c04cb0f79..3b359647638 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 c9119898dc0..b6da35027c1 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 48370fbb0ca..a53d1f0bf38 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 94761840806..ce111793b81 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):