Add context manager to ConfigTree.parse

[moe.git] / t / test.py

diff --git a/t/test.py b/t/test.py
index 122d85031584f2f3cd0c7d0520f0cee7229736a4..15470ab0afb33e377bfad96d690f68cd1cfd861b 100755 (executable)
--- a/t/test.py
+++ b/t/test.py
@@ -1,37 +1,26 @@
 #!/usr/bin/env python
 
 import sys
-sys.path.append('.')
+#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:
+    e.init(['TASK = "sum"; CONTESTANT = "mj"; SOURCE = "som_sol.c"; VERBOSE = "2"'] + sys.argv[1:])
+    e.log.debug("### Evaluating task %s of contestant %s ###\n\n" % (e['TASK'], e['CONTESTANT']))
+    try:
+       e.run()
+    except moe.SolutionError, err: # Why are we catching this?
+       e.status["error"] = err
+       e.log.user.error(err)
+       e.log.exception()
+except:
+    e.log.exception("Moe fatal error")
+    sys.exit(1)