Tests for status, status.py fixes, minor changes

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

diff --git a/t/moe/eval.py b/t/moe/eval.py
index 94ebfa227b61d96ebfb2644e2673e1739f0878b0..3e22c82653f1b7340cdc498c7290f4ee835a27ea 100644 (file)
--- a/t/moe/eval.py
+++ b/t/moe/eval.py
@@ -6,7 +6,6 @@ import moe.box
 import moe.log
 import moe.status
 import moe.pipeline
 import moe.log
 import moe.status
 import moe.pipeline

-import moe.batch

 import moe.util
 import os.path
 import shutil
 import moe.util
 import os.path
 import shutil


@@ -20,7 +19,7 @@ class Eval:
        self.config = moe.config.ConfigTree()
        self.main_pipe = moe.pipeline.Pipeline(self, "main")
        self.test_pipe = moe.pipeline.Pipeline(self, "test")
        self.config = moe.config.ConfigTree()
        self.main_pipe = moe.pipeline.Pipeline(self, "main")
        self.test_pipe = moe.pipeline.Pipeline(self, "test")

-       self.status = moe.status.MoeStatus()
+       self.status = moe.status.Status()

 
     def __getitem__(self, key):
        return self.config[key]
 
     def __getitem__(self, key):
        return self.config[key]


@@ -52,10 +51,10 @@ class Eval:
        self.debug_dump_config()
 
        # insert hooks into main pipeline
        self.debug_dump_config()
 
        # insert hooks into main pipeline

-       self.main_pipe.insert(5, "Eval.hook_init_dirs", hook_init_dirs)
-       self.main_pipe.insert(15, "Eval.hook_load_task_config", hook_load_task_config)
-       self.main_pipe.insert(20, "Eval.hook_init_tasktype", hook_init_tasktype)
-       self.main_pipe.insert(90, "Eval.hook_write_metadata", hook_write_metadata)
+       self.main_pipe.insert(5, hook_init_dirs, "Initialize working directories")
+       self.main_pipe.insert(15, hook_load_task_config, "Load task config")
+       self.main_pipe.insert(20, hook_init_tasktype, "Load tasktype module")
+       self.main_pipe.insert(90, hook_write_metadata, "Write final metadata file")

 
        # ininialize extensions (let them insert hooks) 
        self.config.fix('EXTENSIONS')
 
        # ininialize extensions (let them insert hooks) 
        self.config.fix('EXTENSIONS')


@@ -80,23 +79,23 @@ class Eval:
     def debug_dump_config(self):
        "Dumps config at level DDEBUG (only compiles the dump if main level is low enough)."
        if self.log.level <= 5:
     def debug_dump_config(self):
        "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('\n'.join(self.config.dump('*  ')))
-           self.log.ddebug('**************************')
+           self.log.ddebug(' ****** Config dump: ******')
+           self.log.ddebug('\n'.join(self.config.dump(' * ')))
+           self.log.ddebug(' **************************')

 
     def debug_dump_pipe(self, pipe):
        "Dumps pipeline `pipe` at level DDEBUG (only compiles the dump if main level low enough)."
        if self.log.level <= 5:
 
     def debug_dump_pipe(self, pipe):
        "Dumps pipeline `pipe` at level DDEBUG (only compiles the dump if main level low enough)."
        if self.log.level <= 5:

-           self.log.ddebug('****** Pipeline %r dump: ******'%pipe.name)
-           self.log.ddebug('\n'.join(pipe.dump(prefix='*  ')))
-           self.log.ddebug('**************************')
+           self.log.ddebug(' ****** Pipeline %r dump: ******'%pipe.name)
+           self.log.ddebug('\n'.join(pipe.dump(prefix=' * ')))
+           self.log.ddebug(' **************************')

     
     def debug_dump_status(self):
        "Dumps status metadata at level DDEBUG (only compiles the dump if main level low enough)."
        if self.log.level <= 5:
     
     def debug_dump_status(self):
        "Dumps status metadata at level DDEBUG (only compiles the dump if main level low enough)."
        if self.log.level <= 5:

-           self.log.ddebug('****** Status dump: ******')
-           self.log.ddebug('\n'.join(self.status.dump(prefix='*  ')))
-           self.log.ddebug('**************************')
+           self.log.ddebug(' ****** Status dump: ******')
+           self.log.ddebug('\n'.join(self.status.dump(prefix=' * ')).rstrip())
+           self.log.ddebug(' **************************')

 
 def hook_init_dirs(e):
     """(mainline at time 5) Create and check directories, fix directory variables.
 
 def hook_init_dirs(e):
     """(mainline at time 5) Create and check directories, fix directory variables.


@@ -139,7 +138,6 @@ def hook_write_metadata(e):
     e.log.debug('Writing status file %s', e['STATUS_FILE'])
     with open(e['STATUS_FILE'], 'w') as f:
        e.status.write(f)
     e.log.debug('Writing status file %s', e['STATUS_FILE'])
     with open(e['STATUS_FILE'], 'w') as f:
        e.status.write(f)

-    # TODO: dump to ddebug