Changeset 90

Timestamp:

07/01/06 10:32:59 (3 years ago)

Author:

robin

Message:

expanduser(options.directory)

Files:

• slavetools/trunk/lib/slavetools/entrypoints.py (modified) (1 diff)
• slavetools/trunk/lib/slavetools/masterplug.py (modified) (1 diff)
• slavetools/trunk/lib/slavetools/slaveapi.py (modified) (5 diffs)
• slavetools/trunk/lib/slavetools/slaveplug.py (modified) (2 diffs)
• slavetools/trunk/setup.py (modified) (1 diff)

slavetools/trunk/lib/slavetools/entrypoints.py

@@ -1 @@
-
+ as run_slave

slavetools/trunk/lib/slavetools/masterplug.py

@@ +1 @@
+import os,logging
+from nose.plugins import Plugin
+from slavetools.optionsapi import add_options
+class MasterConfig(Plugin):
+    MASTER_OPTS = [('--master-configfile', dict(
+        default=None))]
+    LOGCHAN='masterconfig'
+    def add_options(self, parser, env=os.environ):
+        super(MasterConfig, self).add_options(parser, env)
+        add_options(parser, self.MASTER_OPTS)
+    def configure(self, options, conf):
+        super(MasterConfig, self).configure(options, conf)
+        if not self.enabled:
+            return
+    def loadTestsFromModule(self, module):
+        log=logging.getLogger(self.LOGCHAN)
+        if hasattr(module, 'wantoptions'):
+            wants,where = module.wantoptions.split('@')
+            log.info('[%s] wants options [%s] at [%s]' % (module.__name__, 
+                wants, where))
+        else:
+            log.info('[%s] does NOT want options' % (module.__name__))
+        return []
+            
+

slavetools/trunk/lib/slavetools/slaveapi.py

@@ -6 +6 @@
-
-__all__=(
-
+merge_common_defaults 
-    'get_program_name get_log '
-    'fmt_msg'
@@ -12 +12 @@
-
-import os, sys, logging
+
+from optionsapi import COMMON_OPTS, option_defaults
-
-def get_program_name(argv=None):
@@ -75 +77 @@
-    return runner(parser.get_prog_name(), options, args, *runxargs, **runxkwargs)
-
+def merge_common_defaults(options):
+    """Ensure common defaults are set."""
+    setdefaults=[]
+    if options is None:
+        options = defaultoptions = option_defaults(None, COMMON_OPTS)
+    else:
+        defaultoptions = option_defaults(None, COMMON_OPTS)
+        for attr in dir(defaultoptions):
+            if not hasattr(options, attr):
+                setattr(options, attr, getattr(defaultoptions, attr))
+                setdefaults.append((attr, getattr(options,attr)))
+    return options,defaultoptions,setdefaults
+
-def run_wrapper_withconfig(programname, options, args, run, *runargs, **runkw):
-    """handles the common options
@@ -84 +99 @@
-
-    rcode = -1
+    options,defaultoptions,setdefaults = merge_common_defaults(options)
-    log = get_log(options, programname)
-    if options.loglevel is not None:
@@ -123 +139 @@
-                options.configfile)
-        conf = type('confile',(),configfile)
-code =
+eturn
-    finally:
-        os.chdir(cwd)
-    return rcode
-
-def fmt_msg(msgkey, msgfmtmap, extrafmtargs, **fmtargs):

slavetools/trunk/lib/slavetools/slaveplug.py

@@ -270 +270 @@
-                # so we want to set a flag that is clear by default.
-                opts.append(opt)
+            elif opt in ['--directory']:
+                opts.append('='.join(
+                    [opt, os.path.expanduser(value)]))
-            else:
-                opts.append('='.join([opt, str(value)]))
@@ -306 +309 @@
-        log = logging.getLogger(self.LOGCHAN)
-        options = self.slave_known_options
+        options.directory = os.path.expanduser(options.directory)
-        self.slave_progname = args[0]
-        cwd = os.getcwd()

slavetools/trunk/setup.py

@@ -25 +25 @@
-    entry_points = {
-        'console_scripts': [
-',
+_slave'
-        'nose.plugins':[
-
-
+
+
+
-        },
-    data_files = find_data(