Fixed pipeline.insert args order

[eval.git] / t / moe / eval.py

diff --git a/t/moe/eval.py b/t/moe/eval.py
index bc1ea83e46ebc18c4530b1b53002df76317d7ef9..46dff8471319f62e00d19077df8773215c211e90 100644 (file)
--- a/t/moe/eval.py
+++ b/t/moe/eval.py
@@ -16,7 +16,7 @@ class Eval:
     """
 
     def __init__(self):
-       self.log = moe.log.Logers()
+       self.log = moe.log.Loggers()
        self.config = moe.config.ConfigTree()
        self.main_pipe = moe.pipeline.MoePipeline("main")
        self.test_pipe = moe.pipeline.MoePipeline("test")
@@ -30,28 +30,13 @@ class Eval:
        self.log.info("Initializing ...")
        
        # set basic builtins
-       self.config.parse('HOME=\'%s\'' % os.getcwd(), source="<builtins>", level=0)
-       self.config.parse('CONFIG="{HOME}/config"', source="<builtins>", level=0)
-       self.config.parse('LOG="{HOME}/log"', source="<builtins>", level=0)
-       self.config.parse('DEBUG_LEVEL="0"', source="<builtins>", level=0)
-       self.config.parse('VERBOSE=""', source="<builtins>", level=0)
+       self.config.parse('HOME = \'%s\'' % os.getcwd(), source="<builtins>", level=0)
+       self.config.parse('CONFIG = "{HOME}/config"', source="<builtins>", level=0)
+       self.config.parse('LOG = "{HOME}/log"', source="<builtins>", level=0)
+       self.config.parse('DEBUG_LEVEL = "0"', source="<builtins>", level=0)
+       self.config.parse('VERBOSE = ""', source="<builtins>", level=0)
+       self.config.parse('EXTENSIONS = ""', source="<builtins>", level=0)
        
-       # Non-basic configuration, should be in default config file 
-       self.config.parse("""
-           TDIR = "{HOME}/test"
-           PDIR = "{HOME}/tasks/{TASK}"
-           USER_LOG = "{TDIR}/log"
-           TASK_CONFIG = "{PDIR}/config"
-           STATUS_FILE = "{TDIR}/status"
-           EXTENSIONS = ""
-           # only for testing: 
-           TASK = "sum"
-           TASK_TYPE = "dummy"
-           USER = "gavento"
-           SOURCE = "suma.c"
-           EXTENSIONS += " dummy "
-           """, source="<temp-builtins>", level=0) # -> config
-
        # apply overrides
        for ov in overrides:
            self.config.parse(ov, source="<overrides>", level=100)
@@ -62,14 +47,10 @@ class Eval:
        # fix variables
        self.config.fix(['LOG', 'USER_LOG', 'VERBOSE', 'HOME', 'DEBUG_LEVEL', 'TDIR'])
        # start logging
-       self.log.open_eval_log(self['LOG'], self['DEBUG_LEVEL'], redirect_fds = True)
+       self.log.open_eval_log(self['LOG'], int(self['DEBUG_LEVEL']), redirect_fds = True)
        self.log.open_user_log(self['USER_LOG'])
        self.debug_dump_config()
 
-       # init and check TDIR
-       self.debug('Cleaning TDIR: %s'%self['TDIR'])
-       self.init_TDIR()
-       
        # insert hooks into main pipeline
        self.main_pipe.insert(5, "Eval.hook_init_dirs", self.hook_init_dirs)
        self.main_pipe.insert(15, "Eval.hook_load_task_config", self.hook_load_task_config)
@@ -77,14 +58,14 @@ class Eval:
        self.main_pipe.insert(90, "Eval.hook_write_metadata", self.hook_write_metadata)
 
        # ininialize extensions (let them insert hooks) 
-       self.conf.fix('EXTENSIONS')
+       self.config.fix('EXTENSIONS')
        exts = self['EXTENSIONS'].split()
        for e in exts:
            if not e:
                raise MoeError, "Invalid extension name: %r" % e
            self.log.debug("Loading extension %s", e)
            try:
-               mod = util.load_module('moe.exts.' + e)
+               mod = moe.util.load_module('moe.exts.' + e)
            except ImportError:
                self.log.exception()
                raise MoeError, 'Unknown extension: %r' % e
@@ -100,7 +81,7 @@ class Eval:
        "Dumps config at level DDEBUG (only compiles the dump if main level is low enough)."
        if self.log.level <= 5:
            self.log.ddebug('****** Config dump: ******')
-           self.log.ddebug(self.config.dump('**** '))
+           self.log.ddebug('\n'.join(self.config.dump('** ')))
            self.log.ddebug('**************************')
 
     def debug_dump_pipe(self, pipe):