test: fix test cases

core/sys_exec/sys_exec.go

@@ -1,16 +1,13 @@
 package sys_exec
 
 import (
-	"bufio"
 	"github.com/crawlab-team/crawlab/trace"
 	"github.com/shirou/gopsutil/process"
 	"os/exec"
-	"time"
 )
 
 type KillProcessOptions struct {
-	Timeout time.Duration
-	Force   bool
+	Force bool
 }
 
 func KillProcess(cmd *exec.Cmd, opts *KillProcessOptions) error {
@@ -25,29 +22,8 @@ func KillProcess(cmd *exec.Cmd, opts *KillProcessOptions) error {
 		return killProcessRecursive(p, opts.Force)
 	}
 
-	if opts.Timeout != 0 {
-		// with timeout
-		return killProcessWithTimeout(p, opts.Timeout, killFunc)
-	} else {
-		// without timeout
-		return killFunc(p)
-	}
-}
-
-func killProcessWithTimeout(p *process.Process, timeout time.Duration, killFunc func(*process.Process) error) error {
-	go func() {
-		if err := killFunc(p); err != nil {
-			trace.PrintError(err)
-		}
-	}()
-	for i := 0; i < int(timeout.Seconds()); i++ {
-		ok, err := process.PidExists(p.Pid)
-		if err == nil && !ok {
-			return nil
-		}
-		time.Sleep(1 * time.Second)
-	}
-	return killProcess(p, true)
+	// without timeout
+	return killFunc(p)
 }
 
 func killProcessRecursive(p *process.Process, force bool) (err error) {
@@ -78,12 +54,3 @@ func killProcess(p *process.Process, force bool) (err error) {
 	}
 	return nil
 }
-
-func ConfigureCmdLogging(cmd *exec.Cmd, fn func(scanner *bufio.Scanner)) {
-	stdout, _ := (*cmd).StdoutPipe()
-	stderr, _ := (*cmd).StderrPipe()
-	scannerStdout := bufio.NewScanner(stdout)
-	scannerStderr := bufio.NewScanner(stderr)
-	go fn(scannerStdout)
-	go fn(scannerStderr)
-}