lbsadmin/bee
1
0
Fork 0
mirror of https://github.com/beego/bee.git synced 2024-11-26 01:11:30 +00:00
Code Issues Releases Activity

modify bee test for more competible with none beego project, and add func safePathAppend

Browse Source
This commit is contained in:
shxsun 2013-09-24 10:42:02 +08:00
parent dbab79687b
commit 8115d5e1b8
2 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
test.go
View File

@ -2,10 +2,11 @@ package main
import ( import (
"os" "os"
path "path/filepath"
"os/exec" "os/exec"
path "path/filepath"
"time" "time"
"bytes"
// "bytes"
) )
var cmdTest = &Command{ var cmdTest = &Command{
@ -18,7 +19,21 @@ func init() {
cmdTest.Run = testApp cmdTest.Run = testApp
} }
var started= make(chan bool) func safePathAppend(arr []string, paths ...string) []string {
for _, path := range paths {
if pathExists(path) {
arr = append(arr, path)
}
}
return arr
}
func pathExists(path string) bool {
_, err := os.Stat(path)
return err == nil || os.IsExist(err)
}
var started = make(chan bool)
func testApp(cmd *Command, args []string) { func testApp(cmd *Command, args []string) {
if len(args) != 1 { if len(args) != 1 {
@ -34,7 +49,7 @@ func testApp(cmd *Command, args []string) {
colorLog("[ERRO] Fail to parse bee.json[ %s ]", err) colorLog("[ERRO] Fail to parse bee.json[ %s ]", err)
} }
var paths []string var paths []string
paths = append(paths, paths = safePathAppend(paths,
path.Join(crupath, conf.DirStruct.Controllers), path.Join(crupath, conf.DirStruct.Controllers),
path.Join(crupath, conf.DirStruct.Models), path.Join(crupath, conf.DirStruct.Models),
path.Join(crupath, "./")) // Current path. path.Join(crupath, "./")) // Current path.
@ -50,32 +65,37 @@ func testApp(cmd *Command, args []string) {
select { select {
case <-started: case <-started:
runTest() runTest()
Kill() //Kill()
os.Exit(0) //os.Exit(0)
} }
} }
} }
func runTest(){ func runTest() {
colorLog("[INFO] Start testing...\n") colorLog("[INFO] Start testing...\n")
time.Sleep(time.Second*5) time.Sleep(time.Second * 1)
path, _ := os.Getwd() crupwd, _ := os.Getwd()
os.Chdir(path+"/tests") testDir := path.Join(crupwd, "tests")
if pathExists(testDir) {
os.Chdir(testDir)
}
var err error var err error
icmd := exec.Command("go", "test") icmd := exec.Command("go", "test")
var out,errbuffer bytes.Buffer //var out,errbuffer bytes.Buffer
icmd.Stdout = &out //icmd.Stdout = &out
icmd.Stderr = &errbuffer //icmd.Stderr = &errbuffer
colorLog("[INFO] ============== Test Begin ===================\n") icmd.Stdout = os.Stdout
icmd.Stderr = os.Stderr
colorLog("[TRAC] ============== Test Begin ===================\n")
err = icmd.Run() err = icmd.Run()
colorLog(out.String()) //colorLog(out.String())
colorLog(errbuffer.String()) //colorLog(errbuffer.String())
colorLog("[INFO] ============== Test End ===================\n") colorLog("[TRAC] ============== Test End ===================\n")
if err != nil { if err != nil {
colorLog("[ERRO] ============== Test failed ===================\n") colorLog("[ERRO] ============== Test failed ===================\n")
colorLog("[ERRO] " ,err) colorLog("[ERRO] ", err)
return return
} }
colorLog("[SUCC] Test finish\n") colorLog("[SUCC] Test finish\n")

7
watch.go
View File

@ -3,7 +3,6 @@ package main
import ( import (
"fmt" "fmt"
"github.com/howeyc/fsnotify" "github.com/howeyc/fsnotify"
"log"
"os" "os"
"os/exec" "os/exec"
"strings" "strings"
@ -51,7 +50,7 @@ func NewWatcher(paths []string) {
go Autobuild() go Autobuild()
} }
case err := <-watcher.Error: case err := <-watcher.Error:
log.Fatal("error:", err) colorLog("[WARN] %s\n", err.Error()) // No need to exit here
} }
} }
}() }()
@ -125,7 +124,7 @@ func Kill() {
fmt.Println("Kill -> ", e) fmt.Println("Kill -> ", e)
} }
}() }()
if cmd != nil { if cmd != nil && cmd.Process != nil {
cmd.Process.Kill() cmd.Process.Kill()
} }
} }
@ -147,7 +146,7 @@ func Start(appname string) {
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
go cmd.Run() go cmd.Run()
started<-true started <- true
} }
// checkTMPFile returns true if the event was for TMP files. // checkTMPFile returns true if the event was for TMP files.