Test variable fixing, update TODO

[eval.git] / t / test.py

diff --git a/t/test.py b/t/test.py
index 122d85031584f2f3cd0c7d0520f0cee7229736a4..26d1a29e4b9bc7abf9b53f9a7adc4c487326ca83 100755 (executable)
--- a/t/test.py
+++ b/t/test.py
@@ -3,35 +3,42 @@
 import sys
 sys.path.append('.')
 
-import moe.meta
+import moe
 import moe.config
+import moe.log
 import moe.eval
 import moe.pipeline
 import moe.batch
-
-overrides = moe.config.parse_overrides(sys.argv)
+import os
 
 e = moe.eval.Eval()
-e.builtins.set("HOME", ".")
-e.builtins.set("TASK", "sum")
-e.builtins.set("CONTESTANT", "mj")
-e.init(overrides)
-
-print "\nTask configuration:"
-e.cfgs.dump()
-print
-
-if len(sys.argv) > 1:
-    file = sys.argv[1]
-else:
-    file = None
-moe.batch.locate(e, file)
-
-print "\nConfiguration after per-extension overrides:"
-e.cfgs.dump()
-print
-
-e.run()
 
-print "\nFinal meta file:"
-e.meta.write()
+try:
+    overrides = moe.config.parse_overrides(sys.argv)
+    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['TASK'], e['CONTESTANT']))
+    e.init(overrides)
+except moe.MoeError, err:
+    e.log.shout("FATAL: %s\n" % err)
+    sys.exit(1)
+
+try:
+    if len(sys.argv) > 1:
+       file = sys.argv[1]
+    else:
+       file = None
+    moe.batch.locate(e, file)
+    e.run()
+except moe.MoeError, err:
+    e.log.shout("FATAL: %s\n" % err)
+    sys.exit(1)
+except moe.SolutionError, err:
+    e.stat["error"] = err
+    e.log.shout("%s\n" % err)
+except Exception:
+    moe.log.fatal_exception()
+
+moe.log.default.progress_file.write("\nFinal status file:\n")
+e.stat.write(file=moe.log.default.progress_file)