X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=t%2Ftest.py;h=26d1a29e4b9bc7abf9b53f9a7adc4c487326ca83;hb=e1cf6c913f8f8d94c1065d05c00a0dfb934b6828;hp=167be9864c583bc2ec0a19390c7821b1f8ae3db5;hpb=919b5d82c3dfeeec89ecb753d64c703b83c6f156;p=eval.git

diff --git a/t/test.py b/t/test.py
index 167be98..26d1a29 100755
--- a/t/test.py
+++ b/t/test.py
@@ -4,11 +4,12 @@ import sys
 sys.path.append('.')
 
 import moe
-import moe.stat
 import moe.config
+import moe.log
 import moe.eval
 import moe.pipeline
 import moe.batch
+import os
 
 e = moe.eval.Eval()
 
@@ -17,9 +18,9 @@ try:
     e.builtins.set("HOME", ".")
     e.builtins.set("TASK", "sum")
     e.builtins.set("CONTESTANT", "mj")
-    e.log.progress("### Evaluating task %s of contestant %s ###\n\n" % (e.cfgs['TASK'], e.cfgs['CONTESTANT']))
+    e.log.progress("### Evaluating task %s of contestant %s ###\n\n" % (e['TASK'], e['CONTESTANT']))
     e.init(overrides)
-except moe.MoeErr, err:
+except moe.MoeError, err:
     e.log.shout("FATAL: %s\n" % err)
     sys.exit(1)
 
@@ -30,13 +31,14 @@ try:
 	file = None
     moe.batch.locate(e, file)
     e.run()
-except moe.MoeErr, err:
+except moe.MoeError, err:
     e.log.shout("FATAL: %s\n" % err)
     sys.exit(1)
-except moe.SolutionErr, err:
-    ## FIXME: In this case, we might write the status file
+except moe.SolutionError, err:
+    e.stat["error"] = err
     e.log.shout("%s\n" % err)
-    sys.exit(1)
+except Exception:
+    moe.log.fatal_exception()
 
-print "\nFinal status file:"
-e.stat.write()
+moe.log.default.progress_file.write("\nFinal status file:\n")
+e.stat.write(file=moe.log.default.progress_file)