Merge "Yardstick Preliminary Documentation"

[yardstick.git] / yardstick / common / utils.py

diff --git a/yardstick/common/utils.py b/yardstick/common/utils.py
index e53f4b4..d2be800 100644 (file)
--- a/yardstick/common/utils.py
+++ b/yardstick/common/utils.py
@@ -134,7 +134,9 @@ def source_env(env_file):
 
 def read_json_from_file(path):
     with open(path, 'r') as f:
-        return jsonutils.load(f)
+        j = f.read()
+    # don't use jsonutils.load() it conflicts with already decoded input
+    return jsonutils.loads(j)
 
 
 def write_json_to_file(path, data, mode='w'):