diff options
| author |   Stefan Stanacar <stefanx.stanacar@intel.com> | 2013-07-12 13:38:53 +0300 |
|---|---|---|
| committer |   Saul Wold <sgw@linux.intel.com> | 2013-07-15 10:29:27 -0700 |
| commit | 1515d33d2c5b7275a3ac20e07c1db1d8273de796 (patch) | |
| tree | e0447ac2afcc67e21da9e5ea76129308bec9b734 | |
| parent | c2c47a002996b8dbcf9b311dff677202b1f11a64 (diff) | |
| download | openembedded-core-contrib-1515d33d2c5b7275a3ac20e07c1db1d8273de796.tar.gz | |
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.
Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/lib/oeqa/oetest.py | 5 | ||||
| -rw-r--r-- | meta/lib/oeqa/runtime/connman.py | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/meta/lib/oeqa/oetest.py b/meta/lib/oeqa/oetest.py index 24548e9267..5777ff8852 100644 --- a/meta/lib/oeqa/oetest.py +++ b/meta/lib/oeqa/oetest.py @@ -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 diff --git a/meta/lib/oeqa/runtime/connman.py b/meta/lib/oeqa/runtime/connman.py index 835e1355c3..5ef96f6b06 100644 --- a/meta/lib/oeqa/runtime/connman.py +++ b/meta/lib/oeqa/runtime/connman.py @@ -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]) |