summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2016-10-25 12:46:57 -0700
committerDylan Baker <dylan@pnwbakers.com>2016-10-26 11:38:24 -0700
commit8df09bfe03f0cd6e8bf284b22726c1274a3a7e42 (patch)
tree21763c2a434f006c21abd019e16c7fa7432f063c /framework
parenta47c2fa787b9a084896b3ad020c27294df0a74df (diff)
framework: fix loading JUnit results
The JUnit loader was never updated to handle PID's as lists rather than a single int. This patch corrects that and allows JUnit results to be loaded again. Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com> Tested-by: Mark Janes <mark.a.janes@intel.com>
Diffstat (limited to 'framework')
-rw-r--r--framework/backends/junit.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/framework/backends/junit.py b/framework/backends/junit.py
index 4c9b7afa9..018cecd2b 100644
--- a/framework/backends/junit.py
+++ b/framework/backends/junit.py
@@ -29,6 +29,10 @@ try:
from lxml import etree
except ImportError:
import xml.etree.cElementTree as etree
+try:
+ import simplejson as json
+except ImportError:
+ import json
import six
@@ -396,7 +400,7 @@ def _load(results_file):
result.time.end = float(line[len('time end: '):])
continue
elif line.startswith('pid:'):
- result.pid = int(line[len('pid: '):])
+ result.pid = json.loads(line[len('pid: '):])
continue