add testdata/stubcmd and use it in testing

Author: Songmu

testdata/.gitignore

@@ -0,0 +1 @@
+stubcmd

testdata/countup.pl

@@ -0,0 +1,51 @@
+package main
+
+import (
+	"flag"
+	"log"
+	"os"
+	"os/signal"
+	"strings"
+	"syscall"
+	"time"
+)
+
+var sigmap = map[string]os.Signal{
+	"INT":  os.Interrupt,
+	"TERM": syscall.SIGTERM,
+}
+
+func main() {
+	var (
+		trap     = flag.String("trap", "", "signals")
+		exit     = flag.Int("exit", 0, "exit status")
+		trapExit = flag.Int("trap-exit", 0, "exit status when trapping signal")
+		sleep    = flag.Float64("sleep", 0, "sleep seconds")
+	)
+	flag.Parse()
+
+	if *trap != "" {
+		var sigs []os.Signal
+		for _, sigStr := range strings.Split(*trap, ",") {
+			sig, ok := sigmap[strings.TrimPrefix(strings.ToUpper(sigStr), "SIG")]
+			if !ok {
+				log.Printf("unknown signal name: %s\n", sigStr)
+				os.Exit(1)
+			}
+			sigs = append(sigs, sig)
+		}
+		c := make(chan os.Signal, 1)
+		signal.Notify(c, sigs...)
+		go func() {
+			for _ = range c {
+				if *trapExit > 0 {
+					os.Exit(*trapExit)
+				}
+			}
+		}()
+	}
+	if *sleep > 0 {
+		time.Sleep(time.Duration(float64(time.Second) * *sleep))
+	}
+	os.Exit(*exit)
+}

testdata/exit_with_23.pl

@@ -1,6 +1,7 @@
 package timeout
 
 import (
+	"fmt"
 	"os"
 	"os/exec"
 	"runtime"
@@ -15,11 +16,17 @@ var (
 	shellflag = "-c"
 )
 
+const stubCmd = "testdata/stubcmd"
+
 func init() {
 	if runtime.GOOS == "windows" {
 		shellcmd = "cmd"
 		shellflag = "/c"
 	}
+	err := exec.Command("go", "build", "-o", stubCmd, "testdata/stubcmd.go").Run()
+	if err != nil {
+		panic(err)
+	}
 }
 
 func TestRun(t *testing.T) {
@@ -63,38 +70,38 @@ func TestRunSimple(t *testing.T) {
 		},
 		{
 			name:         "timed out",
-			cmd:          exec.Command(shellcmd, shellflag, "sleep 3"),
+			cmd:          exec.Command(shellcmd, shellflag, fmt.Sprintf("%s -sleep 3", stubCmd)),
 			duration:     1 * time.Second,
 			signal:       os.Interrupt,
 			expectedExit: 124,
 		},
 		{
 			name:           "timed out with preserve status",
-			cmd:            exec.Command(shellcmd, shellflag, "sleep 3"),
+			cmd:            exec.Command(shellcmd, shellflag, fmt.Sprintf("%s -sleep 3", stubCmd)),
 			duration:       time.Duration(0.1 * float64(time.Second)),
 			preserveStatus: true,
 			expectedExit:   128 + 15,
 			skipOnWin:      true,
 		},
 		{
-			name:           "preserve status (signal handled)",
-			cmd:            exec.Command("perl", "testdata/exit_with_23.pl"),
+			name:           "preserve status (signal trapd)",
+			cmd:            exec.Command(stubCmd, "-trap", "SIGTERM", "-trap-exit", "23", "-sleep", "3"),
 			duration:       1 * time.Second,
 			preserveStatus: true,
 			expectedExit:   23,
 			skipOnWin:      true,
 		},
 		{
 			name:         "kill after",
-			cmd:          exec.Command("perl", "testdata/ignore_sigterm.pl"),
+			cmd:          exec.Command(stubCmd, "-trap", "SIGTERM", "-sleep", "3"),
 			duration:     1 * time.Second,
 			killAfter:    1 * time.Second,
 			signal:       syscall.SIGTERM,
 			expectedExit: exitKilled,
 		},
 		{
-			name:           "ignore sigterm but exited before kill after",
-			cmd:            exec.Command("perl", "testdata/ignore_sigterm.pl"),
+			name:           "trap sigterm but exited before kill after",
+			cmd:            exec.Command(stubCmd, "-trap", "SIGTERM", "-sleep", "3"),
 			duration:       1 * time.Second,
 			killAfter:      5 * time.Second,
 			signal:         syscall.SIGTERM,
@@ -109,8 +116,8 @@ func TestRunSimple(t *testing.T) {
 			skipOnWin:    true,
 		},
 		{
-			name:         "command cannnot be invoked",
-			cmd:          exec.Command("testdata/ignore_sigterm.pl-xxxxxxxxxxxxxxxxxxxxx"),
+			name:         "command cannnot be invoked (command not found)",
+			cmd:          exec.Command("testdata/command-not-found"),
 			duration:     1 * time.Second,
 			expectedExit: 127, // TODO cmd should return 125 on win
 			skipOnWin:    true,

testdata/ignore_sigterm.pl

@@ -37,7 +37,7 @@ func TestRunCommand_signaled(t *testing.T) {
 	}{
 		{
 			name:     "signal handled",
-			cmd:      exec.Command("perl", "testdata/exit_with_23.pl"),
+			cmd:      exec.Command(stubCmd, "-trap", "SIGTERM", "-trap-exit", "23", "-sleep", "3"),
 			exit:     23,
 			signaled: false,
 		},