From caa60040647bf918c038eab6e87f8fd333d3a264 Mon Sep 17 00:00:00 2001
From: Solomon Hykes <solomon@docker.com>
Date: Fri, 9 May 2014 21:12:27 -0700
Subject: [PATCH] inmem: use pkg/testutils

Signed-off-by: Solomon Hykes <solomon@docker.com>
---
 inmem/inmem_test.go | 56 ++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 31 deletions(-)

diff --git a/inmem/inmem_test.go b/inmem/inmem_test.go
index 03267eb4f1..122bfc063f 100644
--- a/inmem/inmem_test.go
+++ b/inmem/inmem_test.go
@@ -1,49 +1,43 @@
 package inmem
 
 import (
+	"github.com/dotcloud/docker/pkg/testutils"
 	"testing"
-	"time"
 )
 
 func TestSimpleSend(t *testing.T) {
 	r, w := Pipe()
-	onTimeout := time.After(100 * time.Millisecond)
-	onRcv := make(chan bool)
-	go func() {
-		msg, in, out, err := r.Receive(0)
+	testutils.Timeout(t, func() {
+		go func() {
+			msg, in, out, err := r.Receive(0)
+			if err != nil {
+				t.Fatal(err)
+			}
+			if msg.Data != "hello world" {
+				t.Fatalf("%#v", *msg)
+			}
+			if msg.Name != "print" {
+				t.Fatalf("%#v", *msg)
+			}
+			if len(msg.Args) != 0 {
+				t.Fatalf("%#v", *msg)
+			}
+			if in != nil {
+				t.Fatalf("%#v", in)
+			}
+			if out != nil {
+				t.Fatalf("%#v", out)
+			}
+		}()
+		in, out, err := w.Send(&Message{Name: "print", Data: "hello world"}, 0)
 		if err != nil {
 			t.Fatal(err)
 		}
-		if msg.Data != "hello world" {
-			t.Fatalf("%#v", *msg)
-		}
-		if msg.Name != "print" {
-			t.Fatalf("%#v", *msg)
-		}
-		if len(msg.Args) != 0 {
-			t.Fatalf("%#v", *msg)
-		}
 		if in != nil {
 			t.Fatalf("%#v", in)
 		}
 		if out != nil {
 			t.Fatalf("%#v", out)
 		}
-		close(onRcv)
-	}()
-	in, out, err := w.Send(&Message{Name: "print", Data: "hello world"}, 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if in != nil {
-		t.Fatalf("%#v", in)
-	}
-	if out != nil {
-		t.Fatalf("%#v", out)
-	}
-	select {
-	case <-onTimeout:
-		t.Fatalf("timeout")
-	case <-onRcv:
-	}
+	})
 }