diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-11 11:54:20 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-16 21:26:15 +0100 |
commit | b618261811c48ff3b98eab1b340a8cd09ef183c6 (patch) | |
tree | 24f3fe70856d432f9c01fa3b51ef0590c67ed808 /meta/lib/oeqa/core/runner.py | |
parent | a98ab5e560e73b6988512fbae5cefe9e42ceed53 (diff) | |
download | openembedded-core-b618261811c48ff3b98eab1b340a8cd09ef183c6.tar.gz openembedded-core-b618261811c48ff3b98eab1b340a8cd09ef183c6.tar.bz2 openembedded-core-b618261811c48ff3b98eab1b340a8cd09ef183c6.zip |
oeqa/runner: Simplify code
There doesn't appear to be any reason we need this _results indirection
any more so remove it.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/core/runner.py')
-rw-r--r-- | meta/lib/oeqa/core/runner.py | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/meta/lib/oeqa/core/runner.py b/meta/lib/oeqa/core/runner.py index 6adbe3827b..0f84a1d280 100644 --- a/meta/lib/oeqa/core/runner.py +++ b/meta/lib/oeqa/core/runner.py @@ -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. |