[oe-commits] [openembedded-core] 14/14: resulttool: Fix tests
git at git.openembedded.org
git at git.openembedded.org
Wed Feb 20 18:01:03 UTC 2019
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 a91cf9ab819961b4dcfc59cc3dc7c19806531511
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Wed Feb 20 17:56:37 2019 +0000
resulttool: Fix tests
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/lib/oeqa/selftest/cases/resulttooltests.py | 106 +++++++++++-------------
1 file changed, 48 insertions(+), 58 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/resulttooltests.py b/meta/lib/oeqa/selftest/cases/resulttooltests.py
index 7bf1ec6..0a089c0 100644
--- a/meta/lib/oeqa/selftest/cases/resulttooltests.py
+++ b/meta/lib/oeqa/selftest/cases/resulttooltests.py
@@ -4,13 +4,46 @@ basepath = os.path.abspath(os.path.dirname(__file__) + '/../../../../../')
lib_path = basepath + '/scripts/lib'
sys.path = sys.path + [lib_path]
from resulttool.report import ResultsTextReport
-from resulttool.regression import ResultsRegressionSelector, ResultsRegression
-from resulttool.merge import ResultsMerge
-from resulttool.store import ResultsGitStore
-from resulttool.resultsutils import checkout_git_dir
+from resulttool import regression as regression
+from resulttool import resultutils as resultutils
from oeqa.selftest.case import OESelftestTestCase
class ResultToolTests(OESelftestTestCase):
+ base_results_data = {'base_result1': {'configuration': {"TEST_TYPE": "runtime",
+ "TESTSERIES": "series1",
+ "IMAGE_BASENAME": "image",
+ "IMAGE_PKGTYPE": "ipk",
+ "DISTRO": "mydistro",
+ "MACHINE": "qemux86"},
+ 'result': {}},
+ 'base_result2': {'configuration': {"TEST_TYPE": "runtime",
+ "TESTSERIES": "series1",
+ "IMAGE_BASENAME": "image",
+ "IMAGE_PKGTYPE": "ipk",
+ "DISTRO": "mydistro",
+ "MACHINE": "qemux86-64"},
+ 'result': {}}}
+ target_results_data = {'target_result1': {'configuration': {"TEST_TYPE": "runtime",
+ "TESTSERIES": "series1",
+ "IMAGE_BASENAME": "image",
+ "IMAGE_PKGTYPE": "ipk",
+ "DISTRO": "mydistro",
+ "MACHINE": "qemux86"},
+ 'result': {}},
+ 'target_result2': {'configuration': {"TEST_TYPE": "runtime",
+ "TESTSERIES": "series1",
+ "IMAGE_BASENAME": "image",
+ "IMAGE_PKGTYPE": "ipk",
+ "DISTRO": "mydistro",
+ "MACHINE": "qemux86"},
+ 'result': {}},
+ 'target_result3': {'configuration': {"TEST_TYPE": "runtime",
+ "TESTSERIES": "series1",
+ "IMAGE_BASENAME": "image",
+ "IMAGE_PKGTYPE": "ipk",
+ "DISTRO": "mydistro",
+ "MACHINE": "qemux86-64"},
+ 'result': {}}}
def test_report_can_aggregate_test_result(self):
result_data = {'result': {'test1': {'status': 'PASSED'},
@@ -25,23 +58,12 @@ class ResultToolTests(OESelftestTestCase):
self.assertTrue(result_report['skipped'] == 1, msg="Skipped count not correct:%s" % result_report['skipped'])
def test_regression_can_get_regression_base_target_pair(self):
- base_results_data = {'base_result1': {'configuration': {"TEST_TYPE": "oeselftest",
- "HOST": "centos-7"}},
- 'base_result2': {'configuration': {"TEST_TYPE": "oeselftest",
- "HOST": "centos-7",
- "MACHINE": "qemux86-64"}}}
- target_results_data = {'target_result1': {'configuration': {"TEST_TYPE": "oeselftest",
- "HOST": "centos-7"}},
- 'target_result2': {'configuration': {"TEST_TYPE": "oeselftest",
- "HOST": "centos-7",
- "MACHINE": "qemux86"}},
- 'target_result3': {'configuration': {"TEST_TYPE": "oeselftest",
- "HOST": "centos-7",
- "MACHINE": "qemux86-64"}}}
- regression = ResultsRegressionSelector()
- pair = regression.get_regression_base_target_pair(self.logger, base_results_data, target_results_data)
- self.assertTrue('target_result1' in pair['base_result1'], msg="Pair not correct:%s" % pair['base_result1'])
- self.assertTrue('target_result3' in pair['base_result2'], msg="Pair not correct:%s" % pair['base_result2'])
+
+ results = {}
+ resultutils.append_resultsdata(results, ResultToolTests.base_results_data)
+ resultutils.append_resultsdata(results, ResultToolTests.target_results_data)
+ self.assertTrue('target_result1' in results['runtime/mydistro/qemux86/image'], msg="Pair not correct:%s" % results)
+ self.assertTrue('target_result3' in results['runtime/mydistro/qemux86-64/image'], msg="Pair not correct:%s" % results)
def test_regrresion_can_get_regression_result(self):
base_result_data = {'result': {'test1': {'status': 'PASSED'},
@@ -54,8 +76,7 @@ class ResultToolTests(OESelftestTestCase):
'test3': {'status': 'PASSED'},
'test4': {'status': 'ERROR'},
'test5': {'status': 'SKIPPED'}}}
- regression = ResultsRegression()
- result = regression.get_regression_result(self.logger, base_result_data, target_result_data)
+ result, text = regression.compare_result(self.logger, "BaseTestRunName", "TargetTestRunName", base_result_data, target_result_data)
self.assertTrue(result['test2']['base'] == 'PASSED',
msg="regression not correct:%s" % result['test2']['base'])
self.assertTrue(result['test2']['target'] == 'FAILED',
@@ -66,39 +87,8 @@ class ResultToolTests(OESelftestTestCase):
msg="regression not correct:%s" % result['test3']['target'])
def test_merge_can_merged_results(self):
- base_results_data = {'base_result1': {},
- 'base_result2': {}}
- target_results_data = {'target_result1': {},
- 'target_result2': {},
- 'target_result3': {}}
-
- merge = ResultsMerge()
- results = merge.merge_results(base_results_data, target_results_data)
- self.assertTrue(len(results.keys()) == 5, msg="merge not correct:%s" % len(results.keys()))
-
- def test_store_can_store_to_new_git_repository(self):
- basepath = os.path.abspath(os.path.dirname(__file__) + '/../../')
- source_dir = basepath + '/files/testresults'
- git_branch = 'qa-cycle-2.7'
- store = ResultsGitStore()
- output_dir = store.store_to_new(self.logger, source_dir, git_branch)
- self.assertTrue(checkout_git_dir(output_dir, git_branch), msg="store to new git repository failed:%s" %
- output_dir)
- store._remove_temporary_workspace_dir(output_dir)
+ results = {}
+ resultutils.append_resultsdata(results, ResultToolTests.base_results_data, configmap=resultutils.flatten_map)
+ resultutils.append_resultsdata(results, ResultToolTests.target_results_data, configmap=resultutils.flatten_map)
+ self.assertEqual(len(results[''].keys()), 5, msg="Flattened results not correct %s" % str(results))
- def test_store_can_store_to_existing(self):
- basepath = os.path.abspath(os.path.dirname(__file__) + '/../../')
- source_dir = basepath + '/files/testresults'
- git_branch = 'qa-cycle-2.6'
- store = ResultsGitStore()
- output_dir = store.store_to_new(self.logger, source_dir, git_branch)
- self.assertTrue(checkout_git_dir(output_dir, git_branch), msg="store to new git repository failed:%s" %
- output_dir)
- git_branch = 'qa-cycle-2.7'
- output_dir = store.store_to_existing_with_new_branch(self.logger, source_dir, output_dir, git_branch)
- self.assertTrue(checkout_git_dir(output_dir, git_branch), msg="store to existing git repository failed:%s" %
- output_dir)
- output_dir = store.store_to_existing(self.logger, source_dir, output_dir, git_branch)
- self.assertTrue(checkout_git_dir(output_dir, git_branch), msg="store to existing git repository failed:%s" %
- output_dir)
- store._remove_temporary_workspace_dir(output_dir)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list