diff options
Diffstat (limited to 'poky/meta/lib/oeqa/runtime/cases')
| -rw-r--r-- | poky/meta/lib/oeqa/runtime/cases/logrotate.py | 6 | ||||
| -rw-r--r-- | poky/meta/lib/oeqa/runtime/cases/perl.py | 2 | ||||
| -rw-r--r-- | poky/meta/lib/oeqa/runtime/cases/ptest.py | 80 |
3 files changed, 32 insertions, 56 deletions
diff --git a/poky/meta/lib/oeqa/runtime/cases/logrotate.py b/poky/meta/lib/oeqa/runtime/cases/logrotate.py index db6e695ee..d2666444e 100644 --- a/poky/meta/lib/oeqa/runtime/cases/logrotate.py +++ b/poky/meta/lib/oeqa/runtime/cases/logrotate.py @@ -9,8 +9,12 @@ from oeqa.runtime.decorator.package import OEHasPackage class LogrotateTest(OERuntimeTestCase): @classmethod + def setUpClass(cls): + cls.tc.target.run('cp /etc/logrotate.d/wtmp $HOME/wtmp.oeqabak') + + @classmethod def tearDownClass(cls): - cls.tc.target.run('rm -rf $HOME/logrotate_dir') + cls.tc.target.run('mv -f $HOME/wtmp.oeqabak /etc/logrotate.d/wtmp && rm -rf $HOME/logrotate_dir') @OETestID(1544) @OETestDepends(['ssh.SSHTest.test_ssh']) diff --git a/poky/meta/lib/oeqa/runtime/cases/perl.py b/poky/meta/lib/oeqa/runtime/cases/perl.py index afeeb180e..be3287f22 100644 --- a/poky/meta/lib/oeqa/runtime/cases/perl.py +++ b/poky/meta/lib/oeqa/runtime/cases/perl.py @@ -1,11 +1,13 @@ import os from oeqa.runtime.case import OERuntimeTestCase +from oeqa.core.decorator.depends import OETestDepends from oeqa.core.decorator.oeid import OETestID from oeqa.runtime.decorator.package import OEHasPackage class PerlTest(OERuntimeTestCase): @OETestID(208) + @OETestDepends(['ssh.SSHTest.test_ssh']) @OEHasPackage(['perl']) def test_perl_works(self): status, output = self.target.run("perl -e '$_=\"Uryyb, jbeyq\"; tr/a-zA-Z/n-za-mN-ZA-M/;print'") diff --git a/poky/meta/lib/oeqa/runtime/cases/ptest.py b/poky/meta/lib/oeqa/runtime/cases/ptest.py index 0972a583e..2a28ca59a 100644 --- a/poky/meta/lib/oeqa/runtime/cases/ptest.py +++ b/poky/meta/lib/oeqa/runtime/cases/ptest.py @@ -1,55 +1,16 @@ import unittest import pprint +import datetime from oeqa.runtime.case import OERuntimeTestCase from oeqa.core.decorator.depends import OETestDepends from oeqa.core.decorator.oeid import OETestID from oeqa.core.decorator.data import skipIfNotFeature from oeqa.runtime.decorator.package import OEHasPackage -from oeqa.utils.logparser import Lparser, Result +from oeqa.utils.logparser import PtestParser class PtestRunnerTest(OERuntimeTestCase): - # a ptest log parser - def parse_ptest(self, logfile): - parser = Lparser(test_0_pass_regex="^PASS:(.+)", - test_0_fail_regex="^FAIL:(.+)", - test_0_skip_regex="^SKIP:(.+)", - section_0_begin_regex="^BEGIN: .*/(.+)/ptest", - section_0_end_regex="^END: .*/(.+)/ptest") - parser.init() - result = Result() - - with open(logfile, errors='replace') as f: - for line in f: - result_tuple = parser.parse_line(line) - if not result_tuple: - continue - result_tuple = line_type, category, status, name = parser.parse_line(line) - - if line_type == 'section' and status == 'begin': - current_section = name - continue - - if line_type == 'section' and status == 'end': - current_section = None - continue - - if line_type == 'test' and status == 'pass': - result.store(current_section, name, status) - continue - - if line_type == 'test' and status == 'fail': - result.store(current_section, name, status) - continue - - if line_type == 'test' and status == 'skip': - result.store(current_section, name, status) - continue - - result.sort_tests() - return result - @OETestID(1600) @skipIfNotFeature('ptest', 'Test requires ptest to be in DISTRO_FEATURES') @OETestDepends(['ssh.SSHTest.test_ssh']) @@ -60,8 +21,6 @@ class PtestRunnerTest(OERuntimeTestCase): if status != 0: self.skipTest("No -ptest packages are installed in the image") - import datetime - test_log_dir = self.td.get('TEST_LOG_DIR', '') # The TEST_LOG_DIR maybe NULL when testimage is added after # testdata.json is generated. @@ -69,9 +28,9 @@ class PtestRunnerTest(OERuntimeTestCase): test_log_dir = os.path.join(self.td.get('WORKDIR', ''), 'testimage') # Don't use self.td.get('DATETIME'), it's from testdata.json, not # up-to-date, and may cause "File exists" when re-reun. - datetime = datetime.datetime.now().strftime('%Y%m%d%H%M%S') + timestamp = datetime.datetime.now().strftime('%Y%m%d%H%M%S') ptest_log_dir_link = os.path.join(test_log_dir, 'ptest_log') - ptest_log_dir = '%s.%s' % (ptest_log_dir_link, datetime) + ptest_log_dir = '%s.%s' % (ptest_log_dir_link, timestamp) ptest_runner_log = os.path.join(ptest_log_dir, 'ptest-runner.log') status, output = self.target.run('ptest-runner', 0) @@ -88,25 +47,36 @@ class PtestRunnerTest(OERuntimeTestCase): extras['ptestresult.rawlogs'] = {'log': output} # Parse and save results - parse_result = self.parse_ptest(ptest_runner_log) - parse_result.log_as_files(ptest_log_dir, test_status = ['pass','fail', 'skip']) + parser = PtestParser() + results, sections = parser.parse(ptest_runner_log) + parser.results_as_files(ptest_log_dir) if os.path.exists(ptest_log_dir_link): # Remove the old link to create a new one os.remove(ptest_log_dir_link) os.symlink(os.path.basename(ptest_log_dir), ptest_log_dir_link) + extras['ptestresult.sections'] = sections + trans = str.maketrans("()", "__") - resmap = {'pass': 'PASSED', 'skip': 'SKIPPED', 'fail': 'FAILED'} - for section in parse_result.result_dict: - for test, result in parse_result.result_dict[section]: - testname = "ptestresult." + section + "." + "_".join(test.translate(trans).split()) - extras[testname] = {'status': resmap[result]} + for section in results: + for test in results[section]: + result = results[section][test] + testname = "ptestresult." + (section or "No-section") + "." + "_".join(test.translate(trans).split()) + extras[testname] = {'status': result} failed_tests = {} - for section in parse_result.result_dict: - failed_testcases = [ "_".join(test.translate(trans).split()) for test, result in parse_result.result_dict[section] if result == 'fail' ] + for section in results: + failed_testcases = [ "_".join(test.translate(trans).split()) for test in results[section] if results[section][test] == 'fail' ] if failed_testcases: failed_tests[section] = failed_testcases + failmsg = "" + status, output = self.target.run('dmesg | grep "Killed process"', 0) + if output: + failmsg = "ERROR: Processes were killed by the OOM Killer:\n%s\n" % output + if failed_tests: - self.fail("Failed ptests:\n%s" % pprint.pformat(failed_tests)) + failmsg = failmsg + "Failed ptests:\n%s" % pprint.pformat(failed_tests) + + if failmsg: + self.fail(failmsg) |
