Susumu Yata
null+****@clear*****
Fri Jul 28 15:04:42 JST 2017
Susumu Yata 2017-07-28 15:04:42 +0900 (Fri, 28 Jul 2017) New Revision: 11e8971f8ae7c31c16597f6cc8eb5ca46a665123 https://github.com/groonga/grnci/commit/11e8971f8ae7c31c16597f6cc8eb5ca46a665123 Message: Don't use log.Fatalf in tests. Modified files: v2/gqtp_test.go v2/http_test.go v2/libgrn/client_test.go Modified: v2/gqtp_test.go (+4 -5) =================================================================== --- v2/gqtp_test.go 2017-07-28 14:57:21 +0900 (e47aa91) +++ v2/gqtp_test.go 2017-07-28 15:04:42 +0900 (efd6961) @@ -4,7 +4,6 @@ import ( "context" "io" "io/ioutil" - "log" "os" "os/exec" "path/filepath" @@ -21,10 +20,10 @@ type gqtpServer struct { } // newGQTPServer creates a new DB and starts a server. -func newGQTPServer(t *testing.T) *gqtpServer { +func newGQTPServer(tb testing.TB) *gqtpServer { dir, err := ioutil.TempDir("", "grnci") if err != nil { - log.Fatalf("ioutil.TempDir failed: %v", err) + tb.Fatalf("ioutil.TempDir failed: %v", err) } path := filepath.Join(dir, "db") @@ -32,7 +31,7 @@ func newGQTPServer(t *testing.T) *gqtpServer { stdin, _ := cmd.StdinPipe() if err := cmd.Start(); err != nil { os.RemoveAll(dir) - t.Skipf("cmd.Start failed: %v", err) + tb.Skipf("cmd.Start failed: %v", err) } stdin.Close() cmd.Wait() @@ -41,7 +40,7 @@ func newGQTPServer(t *testing.T) *gqtpServer { cmd = exec.CommandContext(ctx, "groonga", "-s", "--protocol", "gqtp", path) if err := cmd.Start(); err != nil { os.RemoveAll(dir) - t.Skipf("cmd.Start failed: %v", err) + tb.Skipf("cmd.Start failed: %v", err) } time.Sleep(time.Millisecond * 10) Modified: v2/http_test.go (+4 -5) =================================================================== --- v2/http_test.go 2017-07-28 14:57:21 +0900 (059047c) +++ v2/http_test.go 2017-07-28 15:04:42 +0900 (25035a4) @@ -4,7 +4,6 @@ import ( "context" "io" "io/ioutil" - "log" "os" "os/exec" "path/filepath" @@ -21,10 +20,10 @@ type httpServer struct { } // newHTTPServer creates a new DB and starts a server. -func newHTTPServer(t *testing.T) *httpServer { +func newHTTPServer(tb testing.TB) *httpServer { dir, err := ioutil.TempDir("", "grnci") if err != nil { - log.Fatalf("ioutil.TempDir failed: %v", err) + tb.Fatalf("ioutil.TempDir failed: %v", err) } path := filepath.Join(dir, "db") @@ -32,7 +31,7 @@ func newHTTPServer(t *testing.T) *httpServer { stdin, _ := cmd.StdinPipe() if err := cmd.Start(); err != nil { os.RemoveAll(dir) - t.Skipf("cmd.Start failed: %v", err) + tb.Skipf("cmd.Start failed: %v", err) } stdin.Close() cmd.Wait() @@ -41,7 +40,7 @@ func newHTTPServer(t *testing.T) *httpServer { cmd = exec.CommandContext(ctx, "groonga", "-s", "--protocol", "http", path) if err := cmd.Start(); err != nil { os.RemoveAll(dir) - t.Skipf("cmd.Start failed: %v", err) + tb.Skipf("cmd.Start failed: %v", err) } time.Sleep(time.Millisecond * 10) Modified: v2/libgrn/client_test.go (+5 -6) =================================================================== --- v2/libgrn/client_test.go 2017-07-28 14:57:21 +0900 (7704873) +++ v2/libgrn/client_test.go 2017-07-28 15:04:42 +0900 (c8d25c2) @@ -4,7 +4,6 @@ import ( "context" "io" "io/ioutil" - "log" "os" "os/exec" "path/filepath" @@ -23,10 +22,10 @@ type gqtpServer struct { } // newGQTPServer creates a new DB and starts a server. -func newGQTPServer(t *testing.T) *gqtpServer { +func newGQTPServer(tb testing.TB) *gqtpServer { dir, err := ioutil.TempDir("", "grnci") if err != nil { - log.Fatalf("ioutil.TempDir failed: %v", err) + tb.Fatalf("ioutil.TempDir failed: %v", err) } path := filepath.Join(dir, "db") @@ -34,7 +33,7 @@ func newGQTPServer(t *testing.T) *gqtpServer { stdin, _ := cmd.StdinPipe() if err := cmd.Start(); err != nil { os.RemoveAll(dir) - t.Skipf("cmd.Start failed: %v", err) + tb.Skipf("cmd.Start failed: %v", err) } stdin.Close() cmd.Wait() @@ -43,7 +42,7 @@ func newGQTPServer(t *testing.T) *gqtpServer { cmd = exec.CommandContext(ctx, "groonga", "-s", "--protocol", "gqtp", path) if err := cmd.Start(); err != nil { os.RemoveAll(dir) - t.Skipf("cmd.Start failed: %v", err) + tb.Skipf("cmd.Start failed: %v", err) } time.Sleep(time.Millisecond * 10) @@ -136,7 +135,7 @@ func TestGQTPClient(t *testing.T) { func TestDBClient(t *testing.T) { dir, err := ioutil.TempDir("", "grnci") if err != nil { - log.Fatalf("ioutil.TempDir failed: %v", err) + t.Fatalf("ioutil.TempDir failed: %v", err) } defer os.RemoveAll(dir) -------------- next part -------------- HTML����������������������������...Download