mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-16 09:49:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

lib/oeqa/runtime: cleanup and improve output readability for some tests

Browse Source 
- move everything in the same test. setUp/tearDown aren't quite
the right thing here, everything it's part of the same test. (and
it get's confusing when ssh fails)

ldd:
   - change test name and add output to error message

vnc:
   - remove unnecessary check as there is no point in doing
both ps and netstat. Also improve error output a bit.

(From OE-Core rev: 2f91bb438cfcdd0a40daed5902b6e98fc0aee67f)

Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Stefan Stanacar
2013-09-19 13:49:35 +01:00
committed by Richard Purdie
parent f3ab2fc731
commit ad77d10386
3 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
meta/lib/oeqa/runtime/vnc.py
View File

@@ -9,14 +9,11 @@ class VNCTest(oeRuntimeTest):
@skipUnlessPassed('test_ssh')
def test_vnc(self):
(status, output) = self.target.run('x11vnc -display :0.0 -bg -q')
(status, output) = self.target.run('x11vnc -display :0 -bg -o x11vnc.log')
self.assertEqual(status, 0, msg="x11vnc server failed to start: %s" % output)
port = re.search('PORT=[0-9]*', output)
self.assertTrue(port, msg="Listening port not specified in command output: %s" %output)
(status, output) = self.target.run(oeRuntimeTest.pscmd + ' | grep -i [x]11vnc')
self.assertEqual(status, 0, msg="x11vnc process not running")
vncport = port.group(0).split('=')[1]
(status, output) = self.target.run('netstat -atun | grep :%s | grep LISTEN' % vncport)
self.assertEqual(status, 0, msg="x11vnc server not running on port %s" % vncport)
(status, output) = self.target.run('netstat -ntl | grep ":%s"' % vncport)
self.assertEqual(status, 0, msg="x11vnc server not running on port %s\n\n%s" % (vncport, self.target.run('netstat -ntl; cat x11vnc.log')[1]))