summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/runtime/date.py
diff options
context:
space:
mode:
authorStefan Stanacar <stefanx.stanacar@intel.com>2013-09-19 13:49:35 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-22 12:19:33 +0100
commitad77d1038674ee23ec62aa0df7acbc50f7c4d6d8 (patch)
tree8da3d7e56656a748890fb96bf81353e838792cc6 /meta/lib/oeqa/runtime/date.py
parentf3ab2fc731e5e64e2408eefd6b255a2714c44c30 (diff)
downloadpoky-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/date.py')
-rw-r--r--meta/lib/oeqa/runtime/date.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/meta/lib/oeqa/runtime/date.py b/meta/lib/oeqa/runtime/date.py
index 3b35964763..a208e29ada 100644
--- a/meta/lib/oeqa/runtime/date.py
+++ b/meta/lib/oeqa/runtime/date.py
@@ -4,13 +4,12 @@ import re
4 4
5class DateTest(oeRuntimeTest): 5class DateTest(oeRuntimeTest):
6 6
7 def setUp(self): 7 @skipUnlessPassed("test_ssh")
8 def test_date(self):
8 (status, output) = self.target.run('date +"%Y-%m-%d %T"') 9 (status, output) = self.target.run('date +"%Y-%m-%d %T"')
9 self.assertEqual(status, 0, msg="Failed to get initial date, output: %s" % output) 10 self.assertEqual(status, 0, msg="Failed to get initial date, output: %s" % output)
10 self.oldDate = output 11 oldDate = output
11 12
12 @skipUnlessPassed("test_ssh")
13 def test_date(self):
14 sampleDate = '"2016-08-09 10:00:00"' 13 sampleDate = '"2016-08-09 10:00:00"'
15 (status, output) = self.target.run("date -s %s" % sampleDate) 14 (status, output) = self.target.run("date -s %s" % sampleDate)
16 self.assertEqual(status, 0, msg="Date set failed, output: %s" % output) 15 self.assertEqual(status, 0, msg="Date set failed, output: %s" % output)
@@ -19,6 +18,5 @@ class DateTest(oeRuntimeTest):
19 p = re.match('Tue, 09 Aug 2016 10:00:.. \+0000', output) 18 p = re.match('Tue, 09 Aug 2016 10:00:.. \+0000', output)
20 self.assertTrue(p, msg="The date was not set correctly, output: %s" % output) 19 self.assertTrue(p, msg="The date was not set correctly, output: %s" % output)
21 20
22 def tearDown(self): 21 (status, output) = self.target.run('date -s "%s"' % oldDate)
23 (status, output) = self.target.run('date -s "%s"' % self.oldDate)
24 self.assertEqual(status, 0, msg="Failed to reset date, output: %s" % output) 22 self.assertEqual(status, 0, msg="Failed to reset date, output: %s" % output)