go-gitea/git
1
0
Fork 0
mirror of https://github.com/go-gitea/git.git synced 2026-02-05 06:45:03 +01:00
Code Issues Releases Activity

add simple tests

Browse Source
This commit is contained in:
Unknwon
2015-12-01 16:32:44 -05:00
parent a77d3dcfe4
commit 615a33adec
6 changed files with 135 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
command.go
View File

@@ -7,6 +7,7 @@ package git
import (
"bytes"
"fmt"
"io"
"os/exec"
"strings"
"time"
@@ -41,28 +42,25 @@ func (c *Command) AddArguments(args ...string) *Command {
const DEFAULT_TIMEOUT = 60 * time.Second
// RunInDirTimeout executes the command in given directory with given timeout,
// and returns stdout in []byte and error (combined with stderr).
func (c *Command) RunInDirTimeout(timeout time.Duration, dir string) ([]byte, error) {
// RunInDirTimeoutPipeline executes the command in given directory with given timeout,
// it pipes stdout and stderr to given io.Writer.
func (c *Command) RunInDirTimeoutPipeline(timeout time.Duration, dir string, stdout, stderr io.Writer) error {
if timeout == -1 {
timeout = DEFAULT_TIMEOUT
}
stdout := new(bytes.Buffer)
stderr := new(bytes.Buffer)
// if len(dir) == 0 {
// log(c.String())
// } else {
// log("%s: %v", dir, c)
// }
if len(dir) == 0 {
log(c.String())
} else {
log("%s: %v", dir, c)
}
cmd := exec.Command(c.name, c.args...)
cmd.Dir = dir
cmd.Stdout = stdout
cmd.Stderr = stderr
if err := cmd.Start(); err != nil {
return nil, concatenateError(err, stderr.String())
return err
}
done := make(chan error)
@@ -75,25 +73,39 @@ func (c *Command) RunInDirTimeout(timeout time.Duration, dir string) ([]byte, er
case <-time.After(timeout):
if cmd.Process != nil && cmd.ProcessState != nil && !cmd.ProcessState.Exited() {
if err := cmd.Process.Kill(); err != nil {
return nil, fmt.Errorf("fail to kill process: %v", err)
return fmt.Errorf("fail to kill process: %v", err)
}
}
<-done
return nil, ErrExecTimeout{timeout}
return ErrExecTimeout{timeout}
case err = <-done:
}
if err != nil {
return err
}
// RunInDirTimeout executes the command in given directory with given timeout,
// and returns stdout in []byte and error (combined with stderr).
func (c *Command) RunInDirTimeout(timeout time.Duration, dir string) ([]byte, error) {
stdout := new(bytes.Buffer)
stderr := new(bytes.Buffer)
if err := c.RunInDirTimeoutPipeline(timeout, dir, stdout, stderr); err != nil {
return nil, concatenateError(err, stderr.String())
}
// if stdout.Len() > 0 {
// log("stdout:\n%s", stdout)
// }
if stdout.Len() > 0 {
log("stdout:\n%s", stdout)
}
return stdout.Bytes(), nil
}
// RunInDirPipeline executes the command in given directory,
// it pipes stdout and stderr to given io.Writer.
func (c *Command) RunInDirPipeline(dir string, stdout, stderr io.Writer) error {
return c.RunInDirTimeoutPipeline(-1, dir, stdout, stderr)
}
// RunInDir executes the command in given directory
// and returns stdout in []byte and error (combined with stderr).
func (c *Command) RunInDirBytes(dir string) ([]byte, error) {