Modified test.py (almost rewrite)

[moe.git] / t / test.py

diff --git a/t/test.py b/t/test.py
index b50fed112b18ef7d3e10e143105fae4bec14b2c7..15470ab0afb33e377bfad96d690f68cd1cfd861b 100755 (executable)
--- a/t/test.py
+++ b/t/test.py
@@ -1,42 +1,26 @@
 #!/usr/bin/env python
 
 import sys
 #!/usr/bin/env python
 
 import sys

-sys.path.append('.')
+#sys.path.append('.')

 
 import moe
 
 import moe

-import moe.meta

 import moe.config
 import moe.config

+import moe.log

 import moe.eval
 import moe.pipeline
 import moe.batch
 import moe.eval
 import moe.pipeline
 import moe.batch

+import os

 
 e = moe.eval.Eval()
 
 e = moe.eval.Eval()

-
-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.cfgs['TASK'], e.cfgs['CONTESTANT']))
-    e.init(overrides)
-except moe.MoeErr, err:
-    e.log.shout("FATAL: %s\n" % err)
-    sys.exit(1)
-

 try:
 try:

-    if len(sys.argv) > 1:
-       file = sys.argv[1]
-    else:
-       file = None
-    moe.batch.locate(e, file)
-    e.run()
-except moe.MoeErr, err:
-    e.log.shout("FATAL: %s\n" % err)
-    sys.exit(1)
-except moe.SolutionErr, err:
-    ## FIXME: In this case, we might write the meta file
-    e.log.shout("%s\n" % err)
+    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)
     sys.exit(1)

-
-print "\nFinal meta file:"
-e.meta.write()