X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=t%2Ftest.py;h=26d1a29e4b9bc7abf9b53f9a7adc4c487326ca83;hb=30058c43d5963b139c91800a51705917020722ae;hp=72507206d3178eda0c8c0d934b78a99b97363f02;hpb=8da1e0880f38cdd74fa1b73339860a46f3fa7227;p=eval.git

diff --git a/t/test.py b/t/test.py
index 7250720..26d1a29 100755
--- a/t/test.py
+++ b/t/test.py
@@ -3,36 +3,42 @@
 import sys
 sys.path.append('.')
 
-import moe.meta
+import moe
 import moe.config
+import moe.log
 import moe.eval
 import moe.pipeline
-
-#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()
-
-p = moe.pipeline.MoePipeline('test')
-p.insert(10, 'brum', lambda x: p.insert(30, 'xyzzy', lambda y:y))
-p.insert(20, 'brummm', lambda x: x)
-p.configure("y")
-p.dump()
-p.run(5)
+import moe.batch
+import os
+
+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['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)