[oe-commits] [openembedded-core] 14/18: oeqa/runner: Simplify code
git at git.openembedded.org
git at git.openembedded.org
Sat Jul 14 15:06:28 UTC 2018
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit e95fc526709f1d1a377d4d8da86366f468135a8c
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Wed Jul 11 11:54:20 2018 +0000
oeqa/runner: Simplify code
There doesn't appear to be any reason we need this _results indirection
so remove it.
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/lib/oeqa/core/context.py | 6 +++++-
meta/lib/oeqa/core/decorator/depends.py | 4 +---
meta/lib/oeqa/core/runner.py | 12 ++----------
meta/lib/oeqa/core/tests/test_data.py | 4 ++--
4 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/meta/lib/oeqa/core/context.py b/meta/lib/oeqa/core/context.py
index ec002b1..74f6610 100644
--- a/meta/lib/oeqa/core/context.py
+++ b/meta/lib/oeqa/core/context.py
@@ -27,7 +27,11 @@ class OETestContext(object):
self.logger = logger
self._registry = {}
self._registry['cases'] = collections.OrderedDict()
- self._results = {}
+ self.failures = []
+ self.errors = []
+ self.skipped = []
+ self.expectedFailures = []
+ self.successes = []
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 99eccc1..2badc66 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, 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 219102c..107e324 100644
--- a/meta/lib/oeqa/core/runner.py
+++ b/meta/lib/oeqa/core/runner.py
@@ -45,18 +45,10 @@ class OETestResult(_TestResult):
self.successes = []
self.tc = tc
- self._tc_map_results()
def startTest(self, test):
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 logSummary(self, component, context_msg=''):
elapsed_time = self.tc._run_end_time - self.tc._run_start_time
self.tc.logger.info("SUMMARY:")
@@ -68,7 +60,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)
@@ -76,7 +68,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 320468c..21b6c68 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
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list