Merge pull request #91 from ericchiang/fix-watch-test

*: fix watch test and update tests to use v1.10.4 API server

Author: ericchiang

scripts/run-kube.sh

@@ -14,7 +14,7 @@ docker run \
     -d \
     -v $TEMPDIR:/var/run/kube-test:ro \
     --net=host \
-    gcr.io/google_containers/kube-apiserver-amd64:v1.7.4 \
+    gcr.io/google_containers/kube-apiserver-amd64:v1.10.4 \
     kube-apiserver \
     --etcd-servers=http://localhost:2379 \
     --service-cluster-ip-range=10.0.0.1/16 \

watch_test.go

@@ -42,8 +42,12 @@ func testWatch(t *testing.T, client *k8s.Client, namespace string, newCM func()
 		if eT != eventType {
 			t.Errorf("expected event type %q got %q", eventType, eT)
 		}
+		cm.GetMetadata().ResourceVersion = k8s.String("")
+		got.GetMetadata().ResourceVersion = k8s.String("")
 		if !reflect.DeepEqual(got, cm) {
-			t.Errorf("configmaps did not match\nwant=%#v\ngot=%#v", cm, got)
+			t.Errorf("configmaps didn't match")
+			t.Errorf("want: %#v", cm)
+			t.Errorf(" got: %#v", got)
 		}
 	}