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>
This commit is contained in:
parent
f3ab2fc731
commit
ad77d10386
|
@ -4,13 +4,12 @@ import re
|
|||
|
||||
class DateTest(oeRuntimeTest):
|
||||
|
||||
def setUp(self):
|
||||
(status, output) = self.target.run('date +"%Y-%m-%d %T"')
|
||||
self.assertEqual(status, 0, msg="Failed to get initial date, output: %s" % output)
|
||||
self.oldDate = output
|
||||
|
||||
@skipUnlessPassed("test_ssh")
|
||||
def test_date(self):
|
||||
(status, output) = self.target.run('date +"%Y-%m-%d %T"')
|
||||
self.assertEqual(status, 0, msg="Failed to get initial date, output: %s" % output)
|
||||
oldDate = output
|
||||
|
||||
sampleDate = '"2016-08-09 10:00:00"'
|
||||
(status, output) = self.target.run("date -s %s" % sampleDate)
|
||||
self.assertEqual(status, 0, msg="Date set failed, output: %s" % output)
|
||||
|
@ -19,6 +18,5 @@ class DateTest(oeRuntimeTest):
|
|||
p = re.match('Tue, 09 Aug 2016 10:00:.. \+0000', output)
|
||||
self.assertTrue(p, msg="The date was not set correctly, output: %s" % output)
|
||||
|
||||
def tearDown(self):
|
||||
(status, output) = self.target.run('date -s "%s"' % self.oldDate)
|
||||
(status, output) = self.target.run('date -s "%s"' % oldDate)
|
||||
self.assertEqual(status, 0, msg="Failed to reset date, output: %s" % output)
|
||||
|
|
|
@ -11,9 +11,9 @@ class LddTest(oeRuntimeTest):
|
|||
@skipUnlessPassed('test_ssh')
|
||||
def test_ldd_exists(self):
|
||||
(status, output) = self.target.run('which ldd')
|
||||
self.assertEqual(status, 0, msg = "ldd does not exist in PATH !")
|
||||
self.assertEqual(status, 0, msg = "ldd does not exist in PATH: which ldd: %s" % output)
|
||||
|
||||
@skipUnlessPassed('test_ldd_exists')
|
||||
def test_ldd(self):
|
||||
def test_ldd_rtldlist_check(self):
|
||||
(status, output) = self.target.run('for i in $(which ldd | xargs cat | grep "^RTLDLIST"|cut -d\'=\' -f2|tr -d \'"\'); do test -f $i && echo $i && break; done')
|
||||
self.assertEqual(status, 0, msg = "ldd path not correct or RTLDLIST files don't exist. ")
|
||||
|
|
|
@ -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]))
|
||||
|
|
Loading…
Reference in New Issue