From ad77d1038674ee23ec62aa0df7acbc50f7c4d6d8 Mon Sep 17 00:00:00 2001 From: Stefan Stanacar Date: Thu, 19 Sep 2013 13:49:35 +0100 Subject: 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 Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/date.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'meta/lib/oeqa/runtime/date.py') 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 class DateTest(oeRuntimeTest): - def setUp(self): + @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) - self.oldDate = output + oldDate = output - @skipUnlessPassed("test_ssh") - def test_date(self): 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) -- cgit v1.2.3-54-g00ecf