1
0
mirror of https://github.com/go-task/task.git synced 2025-05-19 22:33:35 +02:00

change all tests to call functions instead of binary directly

I had to temporarely hack github.com/mvdan/sh to fix dir handling
This commit is contained in:
Andrey Nering 2017-07-01 15:32:13 -03:00
parent 9ba44f3e6e
commit ecfd8e8a62
4 changed files with 48 additions and 37 deletions

View File

@ -53,7 +53,11 @@ hello:
} }
if init { if init {
if err := task.InitTaskfile(); err != nil { wd, err := os.Getwd()
if err != nil {
log.Fatal(err)
}
if err := task.InitTaskfile(wd); err != nil {
log.Fatal(err) log.Fatal(err)
} }
return return

View File

@ -4,6 +4,7 @@ import (
"io/ioutil" "io/ioutil"
"log" "log"
"os" "os"
"path/filepath"
) )
const defaultTaskfile = `# github.com/go-task/task const defaultTaskfile = `# github.com/go-task/task
@ -14,14 +15,16 @@ default:
` `
// InitTaskfile Taskfile creates a new Taskfile // InitTaskfile Taskfile creates a new Taskfile
func InitTaskfile() error { func InitTaskfile(path string) error {
for _, f := range []string{"Taskfile.yml", "Taskfile.toml", "Taskfile.json"} { for _, f := range []string{"Taskfile.yml", "Taskfile.toml", "Taskfile.json"} {
f = filepath.Join(path, f)
if _, err := os.Stat(f); err == nil { if _, err := os.Stat(f); err == nil {
return ErrTaskfileAlreadyExists return ErrTaskfileAlreadyExists
} }
} }
if err := ioutil.WriteFile("Taskfile.yml", []byte(defaultTaskfile), 0666); err != nil { f := filepath.Join(path, "Taskfile.yml")
if err := ioutil.WriteFile(f, []byte(defaultTaskfile), 0666); err != nil {
return err return err
} }
log.Printf("Taskfile.yml created in the current directory") log.Printf("Taskfile.yml created in the current directory")

View File

@ -4,7 +4,6 @@ import (
"bytes" "bytes"
"io/ioutil" "io/ioutil"
"os" "os"
"os/exec"
"path/filepath" "path/filepath"
"strings" "strings"
"testing" "testing"
@ -37,7 +36,9 @@ func TestDeps(t *testing.T) {
} }
e := &task.Executor{ e := &task.Executor{
Dir: dir, Dir: dir,
Stdout: ioutil.Discard,
Stderr: ioutil.Discard,
} }
assert.NoError(t, e.ReadTaskfile()) assert.NoError(t, e.ReadTaskfile())
assert.NoError(t, e.Run("default")) assert.NoError(t, e.Run("default"))
@ -69,7 +70,9 @@ func TestVars(t *testing.T) {
} }
e := &task.Executor{ e := &task.Executor{
Dir: dir, Dir: dir,
Stdout: ioutil.Discard,
Stderr: ioutil.Discard,
} }
assert.NoError(t, e.ReadTaskfile()) assert.NoError(t, e.ReadTaskfile())
assert.NoError(t, e.Run("default")) assert.NoError(t, e.Run("default"))
@ -101,7 +104,9 @@ func TestTaskCall(t *testing.T) {
} }
e := &task.Executor{ e := &task.Executor{
Dir: dir, Dir: dir,
Stdout: ioutil.Discard,
Stderr: ioutil.Discard,
} }
assert.NoError(t, e.ReadTaskfile()) assert.NoError(t, e.ReadTaskfile())
assert.NoError(t, e.Run("default")) assert.NoError(t, e.Run("default"))
@ -122,23 +127,23 @@ func TestStatus(t *testing.T) {
if _, err := os.Stat(file); err == nil { if _, err := os.Stat(file); err == nil {
t.Errorf("File should not exists: %v", err) t.Errorf("File should not exists: %v", err)
} }
c := exec.Command("task", "gen-foo")
c.Dir = dir e := &task.Executor{
if err := c.Run(); err != nil { Dir: dir,
t.Error(err) Stdout: ioutil.Discard,
Stderr: ioutil.Discard,
} }
assert.NoError(t, e.ReadTaskfile())
assert.NoError(t, e.Run("gen-foo"))
if _, err := os.Stat(file); err != nil { if _, err := os.Stat(file); err != nil {
t.Errorf("File should exists: %v", err) t.Errorf("File should exists: %v", err)
} }
buff := bytes.NewBuffer(nil) buff := bytes.NewBuffer(nil)
c = exec.Command("task", "gen-foo") e.Stdout, e.Stderr = buff, buff
c.Dir = dir assert.NoError(t, e.Run("gen-foo"))
c.Stderr = buff
c.Stdout = buff
if err := c.Run(); err != nil {
t.Error(err)
}
if buff.String() != `task: Task "gen-foo" is up to date`+"\n" { if buff.String() != `task: Task "gen-foo" is up to date`+"\n" {
t.Errorf("Wrong output message: %s", buff.String()) t.Errorf("Wrong output message: %s", buff.String())
} }
@ -153,11 +158,10 @@ func TestInit(t *testing.T) {
t.Errorf("Taskfile.yml should not exists") t.Errorf("Taskfile.yml should not exists")
} }
c := exec.Command("task", "--init") if err := task.InitTaskfile(dir); err != nil {
c.Dir = dir
if err := c.Run(); err != nil {
t.Error(err) t.Error(err)
} }
if _, err := os.Stat(file); err != nil { if _, err := os.Stat(file); err != nil {
t.Errorf("Taskfile.yml should exists") t.Errorf("Taskfile.yml should exists")
} }

View File

@ -58,19 +58,19 @@ func (r *Runner) binTest(op syntax.BinTestOperator, x, y string) bool {
} }
return re.MatchString(x) return re.MatchString(x)
case syntax.TsNewer: case syntax.TsNewer:
i1, i2 := stat(x), stat(y) i1, i2 := stat(r.Dir, x), stat(r.Dir, y)
if i1 == nil || i2 == nil { if i1 == nil || i2 == nil {
return false return false
} }
return i1.ModTime().After(i2.ModTime()) return i1.ModTime().After(i2.ModTime())
case syntax.TsOlder: case syntax.TsOlder:
i1, i2 := stat(x), stat(y) i1, i2 := stat(r.Dir, x), stat(r.Dir, y)
if i1 == nil || i2 == nil { if i1 == nil || i2 == nil {
return false return false
} }
return i1.ModTime().Before(i2.ModTime()) return i1.ModTime().Before(i2.ModTime())
case syntax.TsDevIno: case syntax.TsDevIno:
i1, i2 := stat(x), stat(y) i1, i2 := stat(r.Dir, x), stat(r.Dir, y)
return os.SameFile(i1, i2) return os.SameFile(i1, i2)
case syntax.TsEql: case syntax.TsEql:
return atoi(x) == atoi(y) return atoi(x) == atoi(y)
@ -95,40 +95,40 @@ func (r *Runner) binTest(op syntax.BinTestOperator, x, y string) bool {
} }
} }
func stat(name string) os.FileInfo { func stat(dir, name string) os.FileInfo {
info, _ := os.Stat(name) info, _ := os.Stat(filepath.Join(dir, name))
return info return info
} }
func statMode(name string, mode os.FileMode) bool { func statMode(dir, name string, mode os.FileMode) bool {
info := stat(name) info := stat(dir, name)
return info != nil && info.Mode()&mode != 0 return info != nil && info.Mode()&mode != 0
} }
func (r *Runner) unTest(op syntax.UnTestOperator, x string) bool { func (r *Runner) unTest(op syntax.UnTestOperator, x string) bool {
switch op { switch op {
case syntax.TsExists: case syntax.TsExists:
return stat(x) != nil return stat(r.Dir, x) != nil
case syntax.TsRegFile: case syntax.TsRegFile:
info := stat(x) info := stat(r.Dir, x)
return info != nil && info.Mode().IsRegular() return info != nil && info.Mode().IsRegular()
case syntax.TsDirect: case syntax.TsDirect:
return statMode(x, os.ModeDir) return statMode(r.Dir, x, os.ModeDir)
//case syntax.TsCharSp: //case syntax.TsCharSp:
//case syntax.TsBlckSp: //case syntax.TsBlckSp:
case syntax.TsNmPipe: case syntax.TsNmPipe:
return statMode(x, os.ModeNamedPipe) return statMode(r.Dir, x, os.ModeNamedPipe)
case syntax.TsSocket: case syntax.TsSocket:
return statMode(x, os.ModeSocket) return statMode(r.Dir, x, os.ModeSocket)
case syntax.TsSmbLink: case syntax.TsSmbLink:
info, _ := os.Lstat(x) info, _ := os.Lstat(x)
return info != nil && info.Mode()&os.ModeSymlink != 0 return info != nil && info.Mode()&os.ModeSymlink != 0
case syntax.TsSticky: case syntax.TsSticky:
return statMode(x, os.ModeSticky) return statMode(r.Dir, x, os.ModeSticky)
case syntax.TsUIDSet: case syntax.TsUIDSet:
return statMode(x, os.ModeSetuid) return statMode(r.Dir, x, os.ModeSetuid)
case syntax.TsGIDSet: case syntax.TsGIDSet:
return statMode(x, os.ModeSetgid) return statMode(r.Dir, x, os.ModeSetgid)
//case syntax.TsGrpOwn: //case syntax.TsGrpOwn:
//case syntax.TsUsrOwn: //case syntax.TsUsrOwn:
//case syntax.TsModif: //case syntax.TsModif:
@ -149,7 +149,7 @@ func (r *Runner) unTest(op syntax.UnTestOperator, x string) bool {
_, err := exec.LookPath(filepath.Join(r.Dir, x)) _, err := exec.LookPath(filepath.Join(r.Dir, x))
return err == nil return err == nil
case syntax.TsNoEmpty: case syntax.TsNoEmpty:
info := stat(x) info := stat(r.Dir, x)
return info != nil && info.Size() > 0 return info != nil && info.Size() > 0
//case syntax.TsFdTerm: //case syntax.TsFdTerm:
case syntax.TsEmpStr: case syntax.TsEmpStr: