balki/pgweb
1
0
Fork 0
Code Pull Requests Activity

Print command output with error in tests

Browse Source
This commit is contained in:
Dan Sosedoff
2015-01-13 22:06:01 -06:00
parent 0860a6b704
commit ead8f0e449
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
client_test.go
View File

@@ -20,25 +20,31 @@ func setupCommands() {
"dropdb": "dropdb", "dropdb": "dropdb",
} }
if runtime.GOOS == "windows" { if onWindows() {
for k, v := range testCommands { for k, v := range testCommands {
testCommands[k] = v + ".exe" testCommands[k] = v + ".exe"
} }
} }
} }
func onWindows() bool {
return runtime.GOOS == "windows"
}
func setup() { func setup() {
out, err := exec.Command(testCommands["createdb"], "-U", "postgres", "-h", "localhost", "booktown").CombinedOutput() out, err := exec.Command(testCommands["createdb"], "-U", "postgres", "-h", "localhost", "booktown").CombinedOutput()
if err != nil { if err != nil {
fmt.Print("Database creation failed:", string(out)) fmt.Println("Database creation failed:", string(out))
fmt.Println("Error:", err)
os.Exit(1) os.Exit(1)
} }
out, err = exec.Command(testCommands["psql"], "-U", "postgres", "-h", "localhost", "-f", "./sql/booktown.sql", "booktown").CombinedOutput() out, err = exec.Command(testCommands["psql"], "-U", "postgres", "-h", "localhost", "-f", "./sql/booktown.sql", "booktown").CombinedOutput()
if err != nil { if err != nil {
fmt.Print("Database import failed:", string(out)) fmt.Println("Database import failed:", string(out))
fmt.Println("Error:", err)
os.Exit(1) os.Exit(1)
} }
} }
@@ -57,7 +63,8 @@ func teardown() {
out, err := exec.Command(testCommands["dropdb"], "-U", "postgres", "-h", "localhost", "booktown").CombinedOutput() out, err := exec.Command(testCommands["dropdb"], "-U", "postgres", "-h", "localhost", "booktown").CombinedOutput()
if err != nil { if err != nil {
fmt.Print(string(out)) fmt.Println(string(out))
fmt.Println("Error:", err)
} }
} }