sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-03-22 10:38:37 +00:00
Code Issues Releases Wiki Activity

workload/rt-app: Better JSON processing error reporting

Browse Source 
The rt-app workload parses the rt-app JSON file in order to override
some options (specifically duration). Previously, if the JSON was
syntactically incorrect, an uninformative ValueError was raised. Now
we raise a ConfigError with appropriate message prompting the user to
fix the file.
This commit is contained in:
Sascha Bischoff 2018-04-27 14:40:31 +01:00 committed by Marc Bonnici
parent b8343e545b
commit 7c1ed6487b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wa/workloads/rt_app/__init__.py
View File

@ -21,7 +21,7 @@ from collections import OrderedDict
from subprocess import CalledProcessError from subprocess import CalledProcessError
from wa import Workload, Parameter, Executable, File from wa import Workload, Parameter, Executable, File
from wa.framework.exception import WorkloadError, ResourceError from wa.framework.exception import WorkloadError, ResourceError, ConfigError
from wa.utils.misc import check_output from wa.utils.misc import check_output
from wa.utils.exec_control import once from wa.utils.exec_control import once
@ -231,7 +231,13 @@ class RtApp(Workload):
config_file = self._generate_workgen_config(user_config_file, config_file = self._generate_workgen_config(user_config_file,
context.output_directory) context.output_directory)
with open(config_file) as fh: with open(config_file) as fh:
try:
config_data = json.load(fh, object_pairs_hook=OrderedDict) config_data = json.load(fh, object_pairs_hook=OrderedDict)
except ValueError:
# We were not able to parse the JSON file. Raise an informative error.
msg = "Failed to parse {}. Please make sure it is valid JSON."
raise ConfigError(msg.format(user_config_file))
self._update_rt_app_config(config_data) self._update_rt_app_config(config_data)
self.duration = config_data['global'].get('duration', 0) self.duration = config_data['global'].get('duration', 0)
self.task_count = len(config_data.get('tasks', [])) self.task_count = len(config_data.get('tasks', []))