diff options
author | Stefan Stanacar <stefanx.stanacar@intel.com> | 2013-09-19 13:49:35 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-22 12:19:33 +0100 |
commit | ad77d1038674ee23ec62aa0df7acbc50f7c4d6d8 (patch) | |
tree | 8da3d7e56656a748890fb96bf81353e838792cc6 /meta/lib/oeqa/runtime/vnc.py | |
parent | f3ab2fc731e5e64e2408eefd6b255a2714c44c30 (diff) | |
download | poky-ad77d1038674ee23ec62aa0df7acbc50f7c4d6d8.tar.gz |
lib/oeqa/runtime: cleanup and improve output readability for some tests
- 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>
Diffstat (limited to 'meta/lib/oeqa/runtime/vnc.py')
-rw-r--r-- | meta/lib/oeqa/runtime/vnc.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/meta/lib/oeqa/runtime/vnc.py b/meta/lib/oeqa/runtime/vnc.py index ce111793b8..5ed10727bc 100644 --- a/meta/lib/oeqa/runtime/vnc.py +++ b/meta/lib/oeqa/runtime/vnc.py | |||
@@ -9,14 +9,11 @@ class VNCTest(oeRuntimeTest): | |||
9 | 9 | ||
10 | @skipUnlessPassed('test_ssh') | 10 | @skipUnlessPassed('test_ssh') |
11 | def test_vnc(self): | 11 | def test_vnc(self): |
12 | (status, output) = self.target.run('x11vnc -display :0.0 -bg -q') | 12 | (status, output) = self.target.run('x11vnc -display :0 -bg -o x11vnc.log') |
13 | self.assertEqual(status, 0, msg="x11vnc server failed to start: %s" % output) | 13 | self.assertEqual(status, 0, msg="x11vnc server failed to start: %s" % output) |
14 | port = re.search('PORT=[0-9]*', output) | 14 | port = re.search('PORT=[0-9]*', output) |
15 | self.assertTrue(port, msg="Listening port not specified in command output: %s" %output) | 15 | self.assertTrue(port, msg="Listening port not specified in command output: %s" %output) |
16 | 16 | ||
17 | (status, output) = self.target.run(oeRuntimeTest.pscmd + ' | grep -i [x]11vnc') | ||
18 | self.assertEqual(status, 0, msg="x11vnc process not running") | ||
19 | |||
20 | vncport = port.group(0).split('=')[1] | 17 | vncport = port.group(0).split('=')[1] |
21 | (status, output) = self.target.run('netstat -atun | grep :%s | grep LISTEN' % vncport) | 18 | (status, output) = self.target.run('netstat -ntl | grep ":%s"' % vncport) |
22 | self.assertEqual(status, 0, msg="x11vnc server not running on port %s" % vncport) | 19 | 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])) |