From b618261811c48ff3b98eab1b340a8cd09ef183c6 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 11 Jul 2018 11:54:20 +0000 Subject: 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 --- meta/lib/oeqa/core/context.py | 1 - meta/lib/oeqa/core/decorator/depends.py | 4 +--- meta/lib/oeqa/core/runner.py | 15 +++++---------- meta/lib/oeqa/core/tests/test_data.py | 4 ++-- 4 files changed, 8 insertions(+), 16 deletions(-) (limited to 'meta/lib/oeqa/core') diff --git a/meta/lib/oeqa/core/context.py b/meta/lib/oeqa/core/context.py index 8cdfbf834f3..f174c4bbcfc 100644 --- a/meta/lib/oeqa/core/context.py +++ b/meta/lib/oeqa/core/context.py @@ -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): diff --git a/meta/lib/oeqa/core/decorator/depends.py b/meta/lib/oeqa/core/decorator/depends.py index 99eccc12685..69c604d8f4b 100644 --- a/meta/lib/oeqa/core/decorator/depends.py +++ b/meta/lib/oeqa/core/decorator/depends.py @@ -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)) diff --git a/meta/lib/oeqa/core/runner.py b/meta/lib/oeqa/core/runner.py index 6adbe3827b4..0f84a1d2803 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. diff --git a/meta/lib/oeqa/core/tests/test_data.py b/meta/lib/oeqa/core/tests/test_data.py index 320468cbe4a..21b6c68b8a4 100755 --- a/meta/lib/oeqa/core/tests/test_data.py +++ b/meta/lib/oeqa/core/tests/test_data.py @@ -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 -- cgit 1.2.3-korg