summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYeoh Ee Peng <ee.peng.yeoh@intel.com>2019-04-09 13:53:07 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-22 00:31:48 +0100
commit3cbf1342dd6d59c29465c5f7792d9edbdb0e249d (patch)
treee38ccc6d045837f4e29ec33fc31c3a5da0bb8c2a
parent2acd92292d896156672de012914e9ef012bdaef4 (diff)
downloadpoky-3cbf1342dd6d59c29465c5f7792d9edbdb0e249d.tar.gz
poky-3cbf1342dd6d59c29465c5f7792d9edbdb0e249d.tar.bz2
poky-3cbf1342dd6d59c29465c5f7792d9edbdb0e249d.zip
resulttool/manualexecution: Enable configuration options selection
Current manualexecution required user to input configuration manually where there were inconsistent inputs and human typo issues. Enable manualexecution to have the optional feature where it will use pre-compiled configuration options file where user will be able to select configuration from the pre-compiled list instead of manual key-in the configuration. This will eliminate human error. Expect the pre-compiled configuration options file in json format below { "bsps-hw": { "IMAGE_BASENAME": { "1": "core-image-sato-sdk" }, "MACHINE": { "1": "beaglebone-yocto", "2": "edgerouter", "3": "mpc8315e-rdb", "4": "genericx86", "5": "genericx86-64" } }, "bsps-qemu": { "IMAGE_BASENAME": { "1": "core-image-sato-sdk" }, "MACHINE": { "1": "qemuarm", "2": "qemuarm64", "3": "qemumips", "4": "qemumips64", "5": "qemuppc", "6": "qemux86", "7": "qemux86-64" } } } (From OE-Core rev: 4c6bac8453768cab9c416c012019ead5edeaafa5) Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/lib/resulttool/manualexecution.py48
1 files changed, 39 insertions, 9 deletions
diff --git a/scripts/lib/resulttool/manualexecution.py b/scripts/lib/resulttool/manualexecution.py
index c94f98126b..57e7b2999e 100755
--- a/scripts/lib/resulttool/manualexecution.py
+++ b/scripts/lib/resulttool/manualexecution.py
@@ -38,7 +38,21 @@ class ManualTestRunner(object):
print('Only lowercase alphanumeric, hyphen and dot are allowed. Please try again')
return output
- def _create_config(self):
+ def _get_available_config_options(self, config_options, test_module, target_config):
+ avail_config_options = None
+ if test_module in config_options:
+ avail_config_options = config_options[test_module].get(target_config)
+ return avail_config_options
+
+ def _choose_config_option(self, options):
+ while True:
+ output = input('{} = '.format('Option index number'))
+ if output in options:
+ break
+ print('Only integer index inputs from above available configuration options are allowed. Please try again.')
+ return options[output]
+
+ def _create_config(self, config_options):
from oeqa.utils.metadata import get_layers
from oeqa.utils.commands import get_bb_var
from resulttool.resultutils import store_map
@@ -54,11 +68,22 @@ class ManualTestRunner(object):
extra_config = set(store_map['manual']) - set(self.configuration)
for config in sorted(extra_config):
- print('---------------------------------------------')
- print('This is configuration #%s. Please provide configuration value(use "None" if not applicable).' % config)
- print('---------------------------------------------')
- value_conf = self._get_input('Configuration Value')
- print('---------------------------------------------\n')
+ avail_config_options = self._get_available_config_options(config_options, self.test_module, config)
+ if avail_config_options:
+ print('---------------------------------------------')
+ print('These are available configuration #%s options:' % config)
+ print('---------------------------------------------')
+ for option, _ in sorted(avail_config_options.items(), key=lambda x: int(x[0])):
+ print('%s: %s' % (option, avail_config_options[option]))
+ print('Please select configuration option, enter the integer index number.')
+ value_conf = self._choose_config_option(avail_config_options)
+ print('---------------------------------------------\n')
+ else:
+ print('---------------------------------------------')
+ print('This is configuration #%s. Please provide configuration value(use "None" if not applicable).' % config)
+ print('---------------------------------------------')
+ value_conf = self._get_input('Configuration Value')
+ print('---------------------------------------------\n')
self.configuration[config] = value_conf
def _create_result_id(self):
@@ -99,9 +124,12 @@ class ManualTestRunner(object):
basepath = os.environ['BUILDDIR']
self.write_dir = basepath + '/tmp/log/manual/'
- def run_test(self, file):
+ def run_test(self, file, config_options_file):
self._get_testcases(file)
- self._create_config()
+ config_options = {}
+ if config_options_file:
+ config_options = load_json_file(config_options_file)
+ self._create_config(config_options)
self._create_result_id()
self._create_write_dir()
test_results = {}
@@ -113,7 +141,7 @@ class ManualTestRunner(object):
def manualexecution(args, logger):
testrunner = ManualTestRunner()
- get_configuration, get_result_id, get_write_dir, get_test_results = testrunner.run_test(args.file)
+ get_configuration, get_result_id, get_write_dir, get_test_results = testrunner.run_test(args.file, args.config_options_file)
resultjsonhelper = OETestResultJSONHelper()
resultjsonhelper.dump_testresult_file(get_write_dir, get_configuration, get_result_id, get_test_results)
return 0
@@ -125,3 +153,5 @@ def register_commands(subparsers):
group='manualexecution')
parser_build.set_defaults(func=manualexecution)
parser_build.add_argument('file', help='specify path to manual test case JSON file.Note: Please use \"\" to encapsulate the file path.')
+ parser_build.add_argument('-c', '--config-options-file', default='',
+ help='the config options file to import and used as available configuration option selection')