Use our determined ps command, otherwise test fails for images with procps.
Signed-off-by: Stefan Stanacar <[email protected]> --- meta/lib/oeqa/runtime/xorg.py | 4 ++-- meta/lib/oeqa/utils/qemurunner.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/runtime/xorg.py b/meta/lib/oeqa/runtime/xorg.py index 96cc20a..12dccd8 100644 --- a/meta/lib/oeqa/runtime/xorg.py +++ b/meta/lib/oeqa/runtime/xorg.py @@ -11,8 +11,8 @@ class XorgTest(oeRuntimeTest): @skipUnlessPassed('test_ssh') def test_xorg_running(self): - (status, output) = self.target.run('ps | grep -v xinit | grep [X]org') - self.assertEqual(status, 0, msg="Xorg does not appear to be running %s" % self.target.run('ps')[1]) + (status, output) = self.target.run(oeRuntimeTest.pscmd + ' | grep -v xinit | grep [X]org') + self.assertEqual(status, 0, msg="Xorg does not appear to be running %s" % self.target.run(oeRuntimeTest.pscmd)[1]) @skipUnlessPassed('test_ssh') def test_xorg_error(self): diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 45b3ccb..426af01 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -25,7 +25,7 @@ class QemuRunner: self.rootfs = rootfs self.streampath = '/tmp/qemuconnection.%s' % os.getpid() - self.qemuparams = 'bootparams="console=tty1 console=ttyS0,115200n8" qemuparams="-serial unix:%s,server,nowait"' % self.streampath + self.qemuparams = 'nographic bootparams="console=tty1 console=ttyS0,115200n8" qemuparams="-serial unix:%s,server,nowait"' % self.streampath self.qemupid = None self.ip = None -- 1.8.3.1 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
