commit 463dfe28d46b4a85b536000c3796676760ed9a99
author Dan Shi <dshi@google.com> Tue Jan 26 13:48:21 2016 -0800
committer chrome-bot <chrome-bot@chromium.org> Tue Jan 26 18:54:29 2016 -0800
tree 0d3ffeaebfc6e192361f66d87e96c979a2575c25
parent b5510c932e485dcff860414e85dae21f07441082

[autotest] Handle json file parsing error

perf_dashboard_shadow_config.json is deployed by puppet and there is no cq to
validate that change. Handle the ValueError in case the json file is
malformated.

BUG=chromium:581382
TEST=None

Change-Id: I91fcfd51b73c5e9654f412ff3c0f630371bd5b30
Reviewed-on: https://chromium-review.googlesource.com/324101
Commit-Ready: Dan Shi <dshi@google.com>
Tested-by: Dan Shi <dshi@chromium.org>
Reviewed-by: Kevin Cheng <kevcheng@chromium.org>

tko/perf_upload/perf_uploader.py

diff --git a/tko/perf_upload/perf_uploader.py b/tko/perf_upload/perf_uploader.py
index c6bc9dc..4bce337 100644
--- a/tko/perf_upload/perf_uploader.py
+++ b/tko/perf_upload/perf_uploader.py
@@ -375,8 +375,12 @@
     hardware_hostname = test.machine
     variant_name = test.attributes.get(constants.VARIANT_KEY, None)
     config_data = _parse_config_file(_PRESENTATION_CONFIG_FILE)
-    shadow_config_data = _parse_config_file(_PRESENTATION_SHADOW_CONFIG_FILE)
-    config_data.update(shadow_config_data)
+    try:
+        shadow_config_data = _parse_config_file(_PRESENTATION_SHADOW_CONFIG_FILE)
+        config_data.update(shadow_config_data)
+    except ValueError as e:
+        tko_utils.dprint('Failed to parse config file %s: %s.' %
+                         (_PRESENTATION_SHADOW_CONFIG_FILE, e))
     try:
         cros_version, chrome_version = _get_version_numbers(test.attributes)
         presentation_info = _gather_presentation_info(config_data, test_name)