Merge pull request #5538 from shykes/pr_out_engine_catchall_handler_is_shadowed_by_specific_handlers

engine/engine.go

@@ -118,13 +118,13 @@ func (eng *Engine) Job(name string, args ...string) *Job {
 	if eng.Logging {
 		job.Stderr.Add(utils.NopWriteCloser(eng.Stderr))
 	}
-	if eng.catchall != nil {
+
-		job.handler = eng.catchall
+	// Catchall is shadowed by specific Register.
-	} else {
+	if handler, exists := eng.handlers[name]; exists {
-		handler, exists := eng.handlers[name]
-		if exists {
 		job.handler = handler
-		}
+	} else if eng.catchall != nil && name != "" {
+		// empty job names are illegal, catchall or not.
+		job.handler = eng.catchall
 	}
 	return job
 }

engine/engine_test.go

@@ -133,3 +133,19 @@ func TestParseJob(t *testing.T) {
 		t.Fatalf("Job was not called")
 	}
 }
+
+func TestCatchallEmptyName(t *testing.T) {
+	eng := New()
+	var called bool
+	eng.RegisterCatchall(func(job *Job) Status {
+		called = true
+		return StatusOK
+	})
+	err := eng.Job("").Run()
+	if err == nil {
+		t.Fatalf("Engine.Job(\"\").Run() should return an error")
+	}
+	if called {
+		t.Fatalf("Engine.Job(\"\").Run() should return an error")
+	}
+}