From c13e4c8c2f10843aa90da40f7ec7c8a2ad61fc8a Mon Sep 17 00:00:00 2001
From: "Timothy St. Clair" <tstclair@redhat.com>
Date: Fri, 18 Dec 2015 17:37:30 -0600
Subject: [PATCH] re-disable TestWatchEtcdError due to flake

---
 pkg/storage/etcd/etcd_watcher_test.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/storage/etcd/etcd_watcher_test.go b/pkg/storage/etcd/etcd_watcher_test.go
index 65654bad60f..fc7453c5b16 100644
--- a/pkg/storage/etcd/etcd_watcher_test.go
+++ b/pkg/storage/etcd/etcd_watcher_test.go
@@ -217,6 +217,7 @@ func TestWatchInterpretation_ResponseBadData(t *testing.T) {
 	}
 }
 
+/* re-Disabling due to flakes seen upstream #18914
 func TestWatchEtcdError(t *testing.T) {
 	codec := testapi.Default.Codec()
 	server := etcdtesting.NewEtcdTestClientServer(t)
@@ -232,7 +233,7 @@ func TestWatchEtcdError(t *testing.T) {
 		t.Fatalf("Unexpected non-error")
 	}
 	watching.Stop()
-}
+}*/
 
 func TestWatch(t *testing.T) {
 	codec := testapi.Default.Codec()