summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2019-10-31 15:12:33 +0000
committerArmin Kuster <akuster808@gmail.com>2019-11-11 11:03:55 -0800
commit4b66d38bcb2b956be5d2112e7c572cd8483246b1 (patch)
treedd03474e56fa8cfcea25feabcd7a5a38dcdceb86
parent1e4e6a5a7396284c2a06605fd89873244b69b52f (diff)
downloadopenembedded-core-contrib-4b66d38bcb2b956be5d2112e7c572cd8483246b1.tar.gz
OEQA: update ltp runtimes to use new structure
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta/lib/oeqa/runtime/cases/ltp.py85
-rw-r--r--meta/lib/oeqa/runtime/cases/ltp_compliance.py73
2 files changed, 7 insertions, 151 deletions
diff --git a/meta/lib/oeqa/runtime/cases/ltp.py b/meta/lib/oeqa/runtime/cases/ltp.py
index 30548640bc..bc6df6b943 100644
--- a/meta/lib/oeqa/runtime/cases/ltp.py
+++ b/meta/lib/oeqa/runtime/cases/ltp.py
@@ -9,51 +9,10 @@ import time
import datetime
import pprint
-from oeqa.runtime.case import OERuntimeTestCase
from oeqa.core.decorator.depends import OETestDepends
from oeqa.runtime.decorator.package import OEHasPackage
from oeqa.utils.logparser import LtpParser
-
-class LtpTestBase(OERuntimeTestCase):
-
- @classmethod
- def setUpClass(cls):
- cls.ltp_startup()
-
- @classmethod
- def tearDownClass(cls):
- cls.ltp_finishup()
-
- @classmethod
- def ltp_startup(cls):
- cls.sections = {}
- cls.failmsg = ""
- test_log_dir = os.path.join(cls.td.get('WORKDIR', ''), 'testimage')
- timestamp = datetime.datetime.now().strftime('%Y%m%d%H%M%S')
-
- cls.ltptest_log_dir_link = os.path.join(test_log_dir, 'ltp_log')
- cls.ltptest_log_dir = '%s.%s' % (cls.ltptest_log_dir_link, timestamp)
- os.makedirs(cls.ltptest_log_dir)
-
- cls.tc.target.run("mkdir -p /opt/ltp/results")
-
- if not hasattr(cls.tc, "extraresults"):
- cls.tc.extraresults = {}
- cls.extras = cls.tc.extraresults
- cls.extras['ltpresult.rawlogs'] = {'log': ""}
-
-
- @classmethod
- def ltp_finishup(cls):
- cls.extras['ltpresult.sections'] = cls.sections
-
- # update symlink to ltp_log
- if os.path.exists(cls.ltptest_log_dir_link):
- os.remove(cls.ltptest_log_dir_link)
- os.symlink(os.path.basename(cls.ltptest_log_dir), cls.ltptest_log_dir_link)
-
- if cls.failmsg:
- cls.fail(cls.failmsg)
+from oeqa.utils.ltp import LtpTestBase
class LtpTest(LtpTestBase):
@@ -64,42 +23,6 @@ class LtpTest(LtpTestBase):
ltp_kernel = ["power_management_tests", "hyperthreading ", "kernel_misc", "hugetlb"]
ltp_groups += ltp_fs
- def runltp(self, ltp_group):
- cmd = '/opt/ltp/runltp -f %s -p -q -r /opt/ltp -l /opt/ltp/results/%s -I 1 -d /opt/ltp' % (ltp_group, ltp_group)
- starttime = time.time()
- (status, output) = self.target.run(cmd)
- endtime = time.time()
-
- with open(os.path.join(self.ltptest_log_dir, "%s-raw.log" % ltp_group), 'w') as f:
- f.write(output)
-
- self.extras['ltpresult.rawlogs']['log'] = self.extras['ltpresult.rawlogs']['log'] + output
-
- # copy nice log from DUT
- dst = os.path.join(self.ltptest_log_dir, "%s" % ltp_group )
- remote_src = "/opt/ltp/results/%s" % ltp_group
- (status, output) = self.target.copyFrom(remote_src, dst)
- msg = 'File could not be copied. Output: %s' % output
- self.assertEqual(status, 0, msg=msg)
-
- parser = LtpParser()
- results, sections = parser.parse(dst)
-
- runtime = int(endtime-starttime)
- sections['duration'] = runtime
- self.sections[ltp_group] = sections
-
- failed_tests = {}
- for test in results:
- result = results[test]
- testname = ("ltpresult." + ltp_group + "." + test)
- self.extras[testname] = {'status': result}
- if result == 'FAILED':
- failed_tests[ltp_group] = test
-
- if failed_tests:
- self.failmsg = self.failmsg + "Failed ptests:\n%s" % pprint.pformat(failed_tests)
-
# LTP runtime tests
@OETestDepends(['ssh.SSHTest.test_ssh'])
@OEHasPackage(["ltp"])
@@ -111,8 +34,10 @@ class LtpTest(LtpTestBase):
@OETestDepends(['ltp.LtpTest.test_ltp_help'])
def test_ltp_groups(self):
for ltp_group in self.ltp_groups:
- self.runltp(ltp_group)
+ self.cmd = '/opt/ltp/runltp -f %s -p -q -r /opt/ltp -l /opt/ltp/results/%s -I 1 -d /opt/ltp' % (ltp_group, ltp_group)
+ self.runltp(ltp_group, 'ltpresult')
@OETestDepends(['ltp.LtpTest.test_ltp_groups'])
def test_ltp_runltp_cve(self):
- self.runltp("cve")
+ self.cmd = '/opt/ltp/runltp -f cve -p -q -r /opt/ltp -l /opt/ltp/results/cve -I 1 -d /opt/ltp'
+ self.runltp('cve')
diff --git a/meta/lib/oeqa/runtime/cases/ltp_compliance.py b/meta/lib/oeqa/runtime/cases/ltp_compliance.py
index ba47c78fd4..8b09c0ae10 100644
--- a/meta/lib/oeqa/runtime/cases/ltp_compliance.py
+++ b/meta/lib/oeqa/runtime/cases/ltp_compliance.py
@@ -13,85 +13,16 @@ from oeqa.runtime.case import OERuntimeTestCase
from oeqa.core.decorator.depends import OETestDepends
from oeqa.runtime.decorator.package import OEHasPackage
from oeqa.utils.logparser import LtpComplianceParser
-
-class LtpPosixBase(OERuntimeTestCase):
-
- @classmethod
- def setUpClass(cls):
- cls.ltp_startup()
-
- @classmethod
- def tearDownClass(cls):
- cls.ltp_finishup()
-
- @classmethod
- def ltp_startup(cls):
- cls.sections = {}
- cls.failmsg = ""
- test_log_dir = os.path.join(cls.td.get('WORKDIR', ''), 'testimage')
- timestamp = datetime.datetime.now().strftime('%Y%m%d%H%M%S')
-
- cls.ltptest_log_dir_link = os.path.join(test_log_dir, 'ltpcomp_log')
- cls.ltptest_log_dir = '%s.%s' % (cls.ltptest_log_dir_link, timestamp)
- os.makedirs(cls.ltptest_log_dir)
-
- cls.tc.target.run("mkdir -p /opt/ltp/results")
-
- if not hasattr(cls.tc, "extraresults"):
- cls.tc.extraresults = {}
- cls.extras = cls.tc.extraresults
- cls.extras['ltpposixresult.rawlogs'] = {'log': ""}
-
-
- @classmethod
- def ltp_finishup(cls):
- cls.extras['ltpposixresult.sections'] = cls.sections
-
- # update symlink to ltp_log
- if os.path.exists(cls.ltptest_log_dir_link):
- os.remove(cls.ltptest_log_dir_link)
-
- os.symlink(os.path.basename(cls.ltptest_log_dir), cls.ltptest_log_dir_link)
-
- if cls.failmsg:
- cls.fail(cls.failmsg)
+from oeqa.utils.ltp import LtpPosixBase
class LtpPosixTest(LtpPosixBase):
posix_groups = ["AIO", "MEM", "MSG", "SEM", "SIG", "THR", "TMR", "TPS"]
- def runltp(self, posix_group):
- cmd = "/opt/ltp/bin/run-posix-option-group-test.sh %s 2>@1 | tee /opt/ltp/results/%s" % (posix_group, posix_group)
- starttime = time.time()
- (status, output) = self.target.run(cmd)
- endtime = time.time()
-
- with open(os.path.join(self.ltptest_log_dir, "%s" % posix_group), 'w') as f:
- f.write(output)
-
- self.extras['ltpposixresult.rawlogs']['log'] = self.extras['ltpposixresult.rawlogs']['log'] + output
-
- parser = LtpComplianceParser()
- results, sections = parser.parse(os.path.join(self.ltptest_log_dir, "%s" % posix_group))
-
- runtime = int(endtime-starttime)
- sections['duration'] = runtime
- self.sections[posix_group] = sections
-
- failed_tests = {}
- for test in results:
- result = results[test]
- testname = ("ltpposixresult." + posix_group + "." + test)
- self.extras[testname] = {'status': result}
- if result == 'FAILED':
- failed_tests[posix_group] = test
-
- if failed_tests:
- self.failmsg = self.failmsg + "Failed ptests:\n%s" % pprint.pformat(failed_tests)
-
# LTP Posix compliance runtime tests
@OETestDepends(['ssh.SSHTest.test_ssh'])
@OEHasPackage(["ltp"])
def test_posix_groups(self):
for posix_group in self.posix_groups:
+ self.cmd = "/opt/ltp/bin/run-posix-option-group-test.sh %s 2>@1 | tee /opt/ltp/results/%s" % (posix_group, posix_group)
self.runltp(posix_group)