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-18 10:18:41 +0100 |
commit | d9de34ce9906399ae9845d0434e2b2b1642bf46a (patch) | |
tree | 6b6ef677d1db920a93a71ab444a91efec39d9919 /meta/lib/oeqa/core/runner.py | |
parent | 4e4958cba2e083eac20e2770e04bfc7d56d9db42 (diff) | |
download | poky-d9de34ce9906399ae9845d0434e2b2b1642bf46a.tar.gz |
oeqa/runner: Simplify code
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>
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): | |||
47 | self.endtime = {} | 47 | self.endtime = {} |
48 | self.progressinfo = {} | 48 | self.progressinfo = {} |
49 | 49 | ||
50 | # Inject into tc so that TestDepends decorator can see results | ||
51 | tc.results = self | ||
52 | |||
50 | self.tc = tc | 53 | self.tc = tc |
51 | self._tc_map_results() | ||
52 | 54 | ||
53 | def startTest(self, test): | 55 | def startTest(self, test): |
54 | # May have been set by concurrencytest | 56 | # May have been set by concurrencytest |
@@ -56,13 +58,6 @@ class OETestResult(_TestResult): | |||
56 | self.starttime[test.id()] = time.time() | 58 | self.starttime[test.id()] = time.time() |
57 | super(OETestResult, self).startTest(test) | 59 | super(OETestResult, self).startTest(test) |
58 | 60 | ||
59 | def _tc_map_results(self): | ||
60 | self.tc._results['failures'] = self.failures | ||
61 | self.tc._results['errors'] = self.errors | ||
62 | self.tc._results['skipped'] = self.skipped | ||
63 | self.tc._results['expectedFailures'] = self.expectedFailures | ||
64 | self.tc._results['successes'] = self.successes | ||
65 | |||
66 | def stopTest(self, test): | 61 | def stopTest(self, test): |
67 | self.endtime[test.id()] = time.time() | 62 | self.endtime[test.id()] = time.time() |
68 | super(OETestResult, self).stopTest(test) | 63 | super(OETestResult, self).stopTest(test) |
@@ -80,7 +75,7 @@ class OETestResult(_TestResult): | |||
80 | msg = "%s - OK - All required tests passed" % component | 75 | msg = "%s - OK - All required tests passed" % component |
81 | else: | 76 | else: |
82 | msg = "%s - FAIL - Required tests failed" % component | 77 | msg = "%s - FAIL - Required tests failed" % component |
83 | skipped = len(self.tc._results['skipped']) | 78 | skipped = len(self.skipped) |
84 | if skipped: | 79 | if skipped: |
85 | msg += " (skipped=%d)" % skipped | 80 | msg += " (skipped=%d)" % skipped |
86 | self.tc.logger.info(msg) | 81 | self.tc.logger.info(msg) |
@@ -88,7 +83,7 @@ class OETestResult(_TestResult): | |||
88 | def _getDetailsNotPassed(self, case, type, desc): | 83 | def _getDetailsNotPassed(self, case, type, desc): |
89 | found = False | 84 | found = False |
90 | 85 | ||
91 | for (scase, msg) in self.tc._results[type]: | 86 | for (scase, msg) in getattr(self, type): |
92 | # XXX: When XML reporting is enabled scase is | 87 | # XXX: When XML reporting is enabled scase is |
93 | # xmlrunner.result._TestInfo instance instead of | 88 | # xmlrunner.result._TestInfo instance instead of |
94 | # string. | 89 | # string. |