Manual merge to resolve conflict 16.01->dev

lib/galaxy/tools/parameters/basic.py

@@ -187,9 +187,10 @@ class ToolParameter( object, Dictifiable ):
         return value
 
     def validate( self, value, trans=None ):
-        if value != '' or not self.optional:
-            for validator in self.validators:
-                validator.validate( value, trans )
+        if value in ["", None] and self.optional:
+            return
+        for validator in self.validators:
+            validator.validate( value, trans )
 
     def to_dict( self, trans, view='collection', value_mapper=None, other_values={} ):
         """ to_dict tool parameter. This can be overridden by subclasses. """

lib/galaxy/workflow/run.py

@@ -153,6 +153,7 @@ class WorkflowInvoker( object ):
         remaining_steps = self.progress.remaining_steps()
         delayed_steps = False
         for step in remaining_steps:
+            step_delayed = False
             step_timer = ExecutionTimer()
             jobs = None
             try:
@@ -167,7 +168,7 @@ class WorkflowInvoker( object ):
                     workflow_invocation_step.workflow_step = step
                     workflow_invocation_step.job = job
             except modules.DelayedWorkflowEvaluation:
-                delayed_steps = True
+                step_delayed = delayed_steps = True
                 self.progress.mark_step_outputs_delayed( step )
             except Exception:
                 log.exception(
@@ -177,7 +178,8 @@ class WorkflowInvoker( object ):
                 )
                 raise
 
-            log.debug("Workflow step %s of invocation %s invoked %s" % (step.id, workflow_invocation.id, step_timer))
+            step_verb = "invoked" if not step_delayed else "delayed"
+            log.debug("Workflow step %s of invocation %s %s %s" % (step.id, workflow_invocation.id, step_verb, step_timer))
 
         if delayed_steps:
             state = model.WorkflowInvocation.states.READY