Changeset 93

Timestamp:

07/12/06 15:24:46 (2 years ago)

Author:

robin

Message:

test harness improvements

Files:

• slavetools/trunk/lib/slavetools/optionsapi.py (modified) (1 diff)
• slavetools/trunk/lib/slavetools/slaveplug.py (modified) (4 diffs)

slavetools/trunk/lib/slavetools/optionsapi.py

@@ -147 +147 @@
-        optparsekwopts = {}
-    parser=optparse.OptionParser(**optparsekwopts)
+    if len(optlists)==1:
+        add_options(parser, optlists[0])
+        return parser
-    add_options(parser, reduce(update_options, optlists))
-    return parser

slavetools/trunk/lib/slavetools/slaveplug.py

@@ -76 +76 @@
-from slavetools.slaveapi_posix import read_pidfile, pidfile_name
-from slavetools.slaveapi_posix import kill_posix, pollpid_posix, launch_process
+
+def with_slaveplug(**kw):
+    def decorate(f):
+        for k in kw:
+            setattr(f, k, kw[k])
+        return f
+    return decorate
-
-PRUNE_SLAVE_LONGOPTS=['--dont-forward-opts']
@@ -249 +256 @@
-            log = logging.getLogger(self.LOGCHAN)
-            options = self.slave_known_options
+            for k,v in getattr(candidate, 'slave_forceoptions', {}
+                    ).iteritems():
+                setattr(options, k,v)
-            args=self.prepare_slave_program(slave_program)
+            for k,forward in getattr(candidate, 'slave_forwardoptions', {}
+                    ).iteritems():
+                if not forward:
+                    continue
+                v = getattr(options, k, None)
+                if v is True:
+                    args.append('--%s' % k)
+                elif v not in [False, None]:
+                    args.append('--%s=%s' % (k, str(v)))
-            pid=[-1]
-            def setup():
@@ -269 +288 @@
-        self.log.info("selecting:%s" % function.__name__)
-        return False
-
-    def prepareTest(self, test):
-        self.log.info('preparing test %s' % test)
-        return test
-
-    def _getprefixedattr(self, options, attr):
@@ -298 +313 @@
-        return self.slave_args and [self.slave_args] or []
-
-
+, options=None
-        """return the *exact* list of args you wish to insert
-