Merge pull request #402 from weaveworks/poll

Fail if want != have!

probe/docker/registry_test.go

@@ -192,7 +192,7 @@ func TestRegistryEvents(t *testing.T) {
 		runtime.Gosched()
 
 		check := func(want []docker.Container) {
-			test.Poll(t, 10*time.Millisecond, want, func() interface{} {
+			test.Poll(t, 100*time.Millisecond, want, func() interface{} {
 				return allContainers(registry)
 			})
 		}

test/poll.go

@@ -19,7 +19,7 @@ func Poll(t *testing.T, d time.Duration, want interface{}, have func() interface
 		time.Sleep(d / 10)
 	}
 	h := have()
-	if reflect.DeepEqual(want, h) {
+	if !reflect.DeepEqual(want, h) {
 		t.Fatal(Diff(want, h))
 	}
 }