X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=t%2Ftest.py;h=167be9864c583bc2ec0a19390c7821b1f8ae3db5;hb=919b5d82c3dfeeec89ecb753d64c703b83c6f156;hp=17403958e76dac023be73c2d407b540243327562;hpb=6eefff783e5c9e3dd393b812869e0c597c74f121;p=moe.git

diff --git a/t/test.py b/t/test.py
index 1740395..167be98 100755
--- a/t/test.py
+++ b/t/test.py
@@ -3,30 +3,40 @@
 import sys
 sys.path.append('.')
 
-import moe.meta
+import moe
+import moe.stat
 import moe.config
 import moe.eval
-
-#m = moe.meta.MoeMeta()
-#m['a'] = '1'
-#m.write()
-
-c = moe.config.MoeConfig(name='/dev/stdin')
-c.dump()
-
-#d = moe.config.MoeConfig(name='/dev/stdin')
-#d.dump()
-
-s = moe.config.MoeConfigStack()
-s.push(c)
-#s.push(d)
-
-s.dump_defs()
-
-#s.apply_overrides("x_")
-#s.dump_defs()
-
-print "***"
-s.dump()
-
-print moe.eval.init_pipeline(s, 'stk_')
+import moe.pipeline
+import moe.batch
+
+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:
+    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 status file
+    e.log.shout("%s\n" % err)
+    sys.exit(1)
+
+print "\nFinal status file:"
+e.stat.write()