Stop timer during initialization in benchmarks.

groonga · Jul 28, 2017 · f3e9623 · f3e9623
1 parent 1fd7ab2
commit f3e9623
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/v2/gqtp_test.go b/v2/gqtp_test.go
@@ -42,7 +42,7 @@ func newGQTPServer(tb testing.TB) *gqtpServer {
 		os.RemoveAll(dir)
 		tb.Skipf("cmd.Start failed: %v", err)
 	}
-	time.Sleep(time.Millisecond * 10)
+	time.Sleep(time.Millisecond * 50)
 
 	return &gqtpServer{
 		dir:    dir,
@@ -61,7 +61,6 @@ func (s *gqtpServer) Close() {
 func TestGQTPClient(t *testing.T) {
 	server := newGQTPServer(t)
 	defer server.Close()
-
 	client, err := NewGQTPClient("", nil)
 	if err != nil {
 		t.Skipf("NewGQTPClient failed: %v", err)
@@ -131,14 +130,15 @@ func TestGQTPClient(t *testing.T) {
 }
 
 func BenchmarkGQTPClient(b *testing.B) {
+	b.StopTimer()
 	server := newGQTPServer(b)
 	defer server.Close()
-
 	client, err := NewGQTPClient("", nil)
 	if err != nil {
 		b.Skipf("NewGQTPClient failed: %v", err)
 	}
 	defer client.Close()
+	b.StartTimer()
 
 	for i := 0; i < b.N; i++ {
 		resp, err := client.Exec("status", nil)

diff --git a/v2/http_test.go b/v2/http_test.go
@@ -42,7 +42,7 @@ func newHTTPServer(tb testing.TB) *httpServer {
 		os.RemoveAll(dir)
 		tb.Skipf("cmd.Start failed: %v", err)
 	}
-	time.Sleep(time.Millisecond * 10)
+	time.Sleep(time.Millisecond * 50)
 
 	return &httpServer{
 		dir:    dir,
@@ -61,7 +61,6 @@ func (s *httpServer) Close() {
 func TestHTTPClient(t *testing.T) {
 	server := newHTTPServer(t)
 	defer server.Close()
-
 	client, err := NewHTTPClient("", nil)
 	if err != nil {
 		t.Skipf("NewHTTPClient failed: %v", err)
@@ -131,14 +130,15 @@ func TestHTTPClient(t *testing.T) {
 }
 
 func BenchmarkHTTPClient(b *testing.B) {
+	b.StopTimer()
 	server := newHTTPServer(b)
 	defer server.Close()
-
 	client, err := NewHTTPClient("", nil)
 	if err != nil {
 		b.Skipf("NewHTTPClient failed: %v", err)
 	}
 	defer client.Close()
+	b.StartTimer()
 
 	for i := 0; i < b.N; i++ {
 		resp, err := client.Exec("status", nil)

diff --git a/v2/libgrn/client_test.go b/v2/libgrn/client_test.go
@@ -44,7 +44,7 @@ func newGQTPServer(tb testing.TB) *gqtpServer {
 		os.RemoveAll(dir)
 		tb.Skipf("cmd.Start failed: %v", err)
 	}
-	time.Sleep(time.Millisecond * 10)
+	time.Sleep(time.Millisecond * 50)
 
 	return &gqtpServer{
 		dir:    dir,
@@ -63,7 +63,6 @@ func (s *gqtpServer) Close() {
 func TestGQTPClient(t *testing.T) {
 	server := newGQTPServer(t)
 	defer server.Close()
-
 	client, err := Dial("", nil)
 	if err != nil {
 		t.Skipf("Dial failed: %v", err)
@@ -138,7 +137,6 @@ func TestDBClient(t *testing.T) {
 		t.Fatalf("ioutil.TempDir failed: %v", err)
 	}
 	defer os.RemoveAll(dir)
-
 	client, err := Create(filepath.Join(dir, "db"), nil)
 	if err != nil {
 		t.Skipf("Dial failed: %v", err)
@@ -208,14 +206,15 @@ func TestDBClient(t *testing.T) {
 }
 
 func BenchmarkGQTPClient(b *testing.B) {
+	b.StopTimer()
 	server := newGQTPServer(b)
 	defer server.Close()
-
 	client, err := Dial("", nil)
 	if err != nil {
 		b.Skipf("Dial failed: %v", err)
 	}
 	defer client.Close()
+	b.StartTimer()
 
 	for i := 0; i < b.N; i++ {
 		resp, err := client.Exec("status", nil)
@@ -239,17 +238,19 @@ func BenchmarkGQTPClient(b *testing.B) {
 }
 
 func BenchmarkDBClient(b *testing.B) {
+	b.StopTimer()
 	dir, err := ioutil.TempDir("", "grnci")
 	if err != nil {
 		b.Fatalf("ioutil.TempDir failed: %v", err)
 	}
 	defer os.RemoveAll(dir)
-
 	client, err := Create(filepath.Join(dir, "db"), nil)
 	if err != nil {
 		b.Skipf("Dial failed: %v", err)
 	}
 	defer client.Close()
+	b.StartTimer()
+
 	for i := 0; i < b.N; i++ {
 		resp, err := client.Exec("status", nil)
 		if err != nil {