From 8672f8b542bc963b5b723d0fe650adc498ba3d5c Mon Sep 17 00:00:00 2001
From: Zach Dwiel <zach.dwiel@intel.com>
Date: Wed, 16 Jan 2019 20:38:11 -0500
Subject: [PATCH] Fix golden tests (#199)

* remove unused functions utils.read_json and utils.write_json
* increase verbosity of golden tests; detect errors in golden tests
---
 rl_coach/tests/test_golden.py | 10 ++++++----
 rl_coach/utils.py             | 14 --------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/rl_coach/tests/test_golden.py b/rl_coach/tests/test_golden.py
index 2bbcb82..2876ce2 100644
--- a/rl_coach/tests/test_golden.py
+++ b/rl_coach/tests/test_golden.py
@@ -100,7 +100,7 @@ def preset_name(request):
 
 
 @pytest.mark.golden_test
-def test_preset_reward(preset_name, no_progress_bar=False, time_limit=60 * 60, verbose=False):
+def test_preset_reward(preset_name, no_progress_bar=True, time_limit=60 * 60, verbose=True):
     preset_validation_params = validation_params(preset_name)
 
     win_size = 10
@@ -221,7 +221,8 @@ def test_preset_reward(preset_name, no_progress_bar=False, time_limit=60 * 60, v
 
     shutil.rmtree(test_path)
     os.remove(log_file_name)
-    return test_passed
+    if not test_passed:
+        raise ValueError('golden test failed')
 
 
 def main():
@@ -278,8 +279,9 @@ def main():
                 continue
 
             test_count += 1
-            test_passed = test_preset_reward(preset_name, args.no_progress_bar, args.time_limit, args.verbose)
-            if not test_passed:
+            try:
+                test_preset_reward(preset_name, args.no_progress_bar, args.time_limit, args.verbose)
+            except Exception as e:
                 fail_count += 1
 
     screen.separator()
diff --git a/rl_coach/utils.py b/rl_coach/utils.py
index a8ace7a..452e5d0 100644
--- a/rl_coach/utils.py
+++ b/rl_coach/utils.py
@@ -17,7 +17,6 @@
 import importlib
 import importlib.util
 import inspect
-import json
 import os
 import re
 import signal
@@ -85,19 +84,6 @@ def is_empty(str):
     return str == 0 or len(str.replace("'", "").replace("\"", "")) == 0
 
 
-def read_json(filename):
-    # read json file
-    with open(filename, 'r') as f:
-        dict = json.loads(f.read())
-        return dict
-
-
-def write_json(filename, dict):
-    # read json file
-    with open(filename, 'w') as f:
-        f.write(json.dumps(dict, indent=4))
-
-
 def path_is_valid_dir(path):
     return os.path.isdir(path)