MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

oeqa/runner: Simplify code

Browse Source 
There doesn't appear to be any reason we need this _results indirection
any more so remove it.

(From OE-Core rev: b618261811c48ff3b98eab1b340a8cd09ef183c6)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2018-07-11 11:54:20 +00:00
parent 4e4958cba2
commit d9de34ce99
4 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta/lib/oeqa/core/context.py
View File

@ -27,7 +27,6 @@ class OETestContext(object):
self.logger = logger
self._registry = {}
self._registry['cases'] = collections.OrderedDict()
self._results = {}
def _read_modules_from_manifest(self, manifest):
if not os.path.exists(manifest):

4
meta/lib/oeqa/core/decorator/depends.py
View File

@ -63,12 +63,10 @@ def _order_test_case_by_depends(cases, depends):
return [cases[case_id] for case_id in cases_ordered]
def _skipTestDependency(case, depends):
results = case.tc._results
skipReasons = ['errors', 'failures', 'skipped']
for reason in skipReasons:
for test, _ in results[reason]:
for test, _ in getattr(case.tc.results, reason):
if test.id() in depends:
raise SkipTest("Test case %s depends on %s and was in %s." \
% (case.id(), test.id(), reason))

15
meta/lib/oeqa/core/runner.py
View File

@ -47,8 +47,10 @@ class OETestResult(_TestResult):
self.endtime = {}
self.progressinfo = {}
# Inject into tc so that TestDepends decorator can see results
tc.results = self
self.tc = tc
self._tc_map_results()
def startTest(self, test):
# May have been set by concurrencytest
@ -56,13 +58,6 @@ class OETestResult(_TestResult):
self.starttime[test.id()] = time.time()
super(OETestResult, self).startTest(test)
def _tc_map_results(self):
self.tc._results['failures'] = self.failures
self.tc._results['errors'] = self.errors
self.tc._results['skipped'] = self.skipped
self.tc._results['expectedFailures'] = self.expectedFailures
self.tc._results['successes'] = self.successes
def stopTest(self, test):
self.endtime[test.id()] = time.time()
super(OETestResult, self).stopTest(test)
@ -80,7 +75,7 @@ class OETestResult(_TestResult):
msg = "%s - OK - All required tests passed" % component
else:
msg = "%s - FAIL - Required tests failed" % component
skipped = len(self.tc._results['skipped'])
skipped = len(self.skipped)
if skipped:
msg += " (skipped=%d)" % skipped
self.tc.logger.info(msg)
@ -88,7 +83,7 @@ class OETestResult(_TestResult):
def _getDetailsNotPassed(self, case, type, desc):
found = False
for (scase, msg) in self.tc._results[type]:
for (scase, msg) in getattr(self, type):
# XXX: When XML reporting is enabled scase is
# xmlrunner.result._TestInfo instance instead of
# string.

4
meta/lib/oeqa/core/tests/test_data.py
View File

@ -21,7 +21,7 @@ class TestData(TestBase):
tc = self._testLoader(modules=self.modules)
self.assertEqual(False, tc.runTests().wasSuccessful())
for test, data in tc._results['errors']:
for test, data in tc.errors:
expect = False
if expectedException in data:
expect = True
@ -34,7 +34,7 @@ class TestData(TestBase):
tc = self._testLoader(d=d, modules=self.modules)
self.assertEqual(False, tc.runTests().wasSuccessful())
for test, data in tc._results['failures']:
for test, data in tc.failures:
expect = False
if expectedError in data:
expect = True