Update tests to properly use IsServing

mlaventure · mlaventure · commit fed5ad4bc5f9 · 2017-08-11T13:13:13.000-07:00
Signed-off-by: Kenfe-Mickael Laventure &lt;mickael.laventure@gmail.com&gt;
diff --git a/client_test.go b/client_test.go
@@ -11,6 +11,7 @@ import (
 	"os/exec"
 	"runtime"
 	"testing"
+	"time"
 
 	"google.golang.org/grpc/grpclog"
 
@@ -73,18 +74,20 @@ func TestMain(m *testing.M) {
 		}
 	}
 
-	client, err := ctrd.waitForStart(ctx)
+	waitCtx, waitCancel := context.WithTimeout(ctx, 2*time.Second)
+	client, err := ctrd.waitForStart(waitCtx)
+	waitCancel()
 	if err != nil {
 		ctrd.Kill()
 		ctrd.Wait()
-		fmt.Fprintf(os.Stderr, "%s: %s", err, buf.String())
+		fmt.Fprintf(os.Stderr, "%s: %s\n", err, buf.String())
 		os.Exit(1)
 	}
 
 	// print out the version in information
 	version, err := client.Version(ctx)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "error getting version: %s", err)
+		fmt.Fprintf(os.Stderr, "error getting version: %s\n", err)
 		os.Exit(1)
 	}
 
@@ -99,7 +102,7 @@ func TestMain(m *testing.M) {
 		if _, err = client.Pull(ctx, testImage, WithPullUnpack); err != nil {
 			ctrd.Stop()
 			ctrd.Wait()
-			fmt.Fprintf(os.Stderr, "%s: %s", err, buf.String())
+			fmt.Fprintf(os.Stderr, "%s: %s\n", err, buf.String())
 			os.Exit(1)
 		}
 	}
diff --git a/container_linux_test.go b/container_linux_test.go
@@ -240,14 +240,9 @@ func TestDaemonRestart(t *testing.T) {
 
 	<-statusC
 
-	serving := false
-	for i := 0; i < 20; i++ {
-		serving, err = client.IsServing(ctx)
-		if serving {
-			break
-		}
-		time.Sleep(100 * time.Millisecond)
-	}
+	waitCtx, waitCancel := context.WithTimeout(ctx, 2*time.Second)
+	serving, err := client.IsServing(waitCtx)
+	waitCancel()
 	if !serving {
 		t.Fatalf("containerd did not start within 2s: %v", err)
 	}
diff --git a/daemon_test.go b/daemon_test.go
@@ -2,7 +2,6 @@ package containerd
 
 import (
 	"context"
-	"fmt"
 	"io"
 	"os/exec"
 	"sync"
@@ -44,19 +43,19 @@ func (d *daemon) waitForStart(ctx context.Context) (*Client, error) {
 		err     error
 	)
 
-	for i := 0; i < 20; i++ {
-		if client == nil {
-			client, err = New(d.addr)
-		}
+	client, err = New(address)
+	if err != nil {
+		return nil, err
+	}
+	serving, err = client.IsServing(ctx)
+	if !serving {
+		client.Close()
 		if err == nil {
-			serving, err = client.IsServing(ctx)
-			if serving {
-				return client, nil
-			}
+			err = errors.New("connection was successful but service is not available")
 		}
-		time.Sleep(100 * time.Millisecond)
+		return nil, err
 	}
-	return nil, fmt.Errorf("containerd did not start within 2s: %v", err)
+	return client, err
 }
 
 func (d *daemon) Stop() error {

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import (`
`11`	`11`	`"os/exec"`
`12`	`12`	`"runtime"`
`13`	`13`	`"testing"`
	`14`	`+ "time"`
`14`	`15`
`15`	`16`	`"google.golang.org/grpc/grpclog"`
`16`	`17`
`@@ -73,18 +74,20 @@ func TestMain(m *testing.M) {`
`73`	`74`	`}`
`74`	`75`	`}`
`75`	`76`
`76`		`- client, err := ctrd.waitForStart(ctx)`
	`77`	`+ waitCtx, waitCancel := context.WithTimeout(ctx, 2*time.Second)`
	`78`	`+ client, err := ctrd.waitForStart(waitCtx)`
	`79`	`+ waitCancel()`
`77`	`80`	`if err != nil {`
`78`	`81`	`ctrd.Kill()`
`79`	`82`	`ctrd.Wait()`
`80`		`- fmt.Fprintf(os.Stderr, "%s: %s", err, buf.String())`
	`83`	`+ fmt.Fprintf(os.Stderr, "%s: %s\n", err, buf.String())`
`81`	`84`	`os.Exit(1)`
`82`	`85`	`}`
`83`	`86`
`84`	`87`	`// print out the version in information`
`85`	`88`	`version, err := client.Version(ctx)`
`86`	`89`	`if err != nil {`
`87`		`- fmt.Fprintf(os.Stderr, "error getting version: %s", err)`
	`90`	`+ fmt.Fprintf(os.Stderr, "error getting version: %s\n", err)`
`88`	`91`	`os.Exit(1)`
`89`	`92`	`}`
`90`	`93`
`@@ -99,7 +102,7 @@ func TestMain(m *testing.M) {`
`99`	`102`	`if _, err = client.Pull(ctx, testImage, WithPullUnpack); err != nil {`
`100`	`103`	`ctrd.Stop()`
`101`	`104`	`ctrd.Wait()`
`102`		`- fmt.Fprintf(os.Stderr, "%s: %s", err, buf.String())`
	`105`	`+ fmt.Fprintf(os.Stderr, "%s: %s\n", err, buf.String())`
`103`	`106`	`os.Exit(1)`
`104`	`107`	`}`
`105`	`108`	`}`