Merge pull request #1049 from brendandburns/flake

Fix a flake by extending the time out, so we don't race a go routine.

pkg/tools/etcd_tools_watch_test.go

@@ -425,7 +425,7 @@ func TestWatchFromOtherError(t *testing.T) {
 		if ok {
 			t.Fatalf("expected result channel to be closed")
 		}
-	case <-time.After(1 * time.Millisecond):
+	case <-time.After(1 * time.Second):
 		t.Fatalf("watch should have closed channel: %#v", watching)
 	}