lib/oeqa/oetest.py: provide a ps command for all tests

Many tests will use 'ps' but we need to know if it's busybox
or standard ps.
Drop the existing check from the connman test.

(From OE-Core rev: 1515d33d2c5b7275a3ac20e07c1db1d8273de796)

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>
This commit is contained in:
Stefan Stanacar 2013-07-12 13:38:53 +03:00 committed by Richard Purdie
parent b69f91f786
commit 7f57d3c524
2 changed files with 2 additions and 8 deletions

View File

@ -9,7 +9,8 @@ def runTests(tc):
# set the context object passed from the test class
setattr(oeRuntimeTest, "tc", tc)
# set ps command to use
setattr(oeRuntimeTest, "pscmd", "ps -ef" if oeRuntimeTest.hasPackage("procps") else "ps")
# prepare test suite, loader and runner
suite = unittest.TestSuite()
testloader = unittest.TestLoader()
@ -30,7 +31,6 @@ class oeRuntimeTest(unittest.TestCase):
testFailures = []
testSkipped = []
testErrors = []
pscmd = "ps"
def __init__(self, methodName='runTest'):
self.target = oeRuntimeTest.tc.target
@ -74,7 +74,6 @@ class oeRuntimeTest(unittest.TestCase):
def getmodule(pos=2):
# stack returns a list of tuples containg frame information
# First element of the list the is current frame, caller is 1

View File

@ -17,11 +17,6 @@ class ConnmanTest(oeRuntimeTest):
@skipUnlessPassed('test_connmand_help')
def test_connmand_running(self):
status = self.target.run('ls -l `which ps` | grep busybox')[0]
if status == 0:
oeRuntimeTest.pscmd = 'ps'
else:
oeRuntimeTest.pscmd = 'ps -ef'
(status, output) = self.target.run(oeRuntimeTest.pscmd + ' | grep [c]onnmand')
self.assertEqual(status, 0, msg="no connmand process, ps output: %s" % self.target.run(oeRuntimeTest.pscmd)[1])