From a6126dc55a632463853c3d31711e51c548c30204 Mon Sep 17 00:00:00 2001 From: Joe Betz Date: Tue, 9 Apr 2019 14:43:37 -0700 Subject: [PATCH] Promote 'watch-consistency' e2e test to be a conformance test --- test/conformance/testdata/conformance.txt | 1 + test/e2e/apimachinery/watch.go | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/test/conformance/testdata/conformance.txt b/test/conformance/testdata/conformance.txt index 8ce92e5ef19..bcd596a8d41 100644 --- a/test/conformance/testdata/conformance.txt +++ b/test/conformance/testdata/conformance.txt @@ -13,6 +13,7 @@ test/e2e/apimachinery/watch.go: "should observe add, update, and delete watch no test/e2e/apimachinery/watch.go: "should be able to start watching from a specific resource version" test/e2e/apimachinery/watch.go: "should be able to restart watching from the last resource version observed by the previous watch" test/e2e/apimachinery/watch.go: "should observe an object deletion if it stops meeting the requirements of the selector" +test/e2e/apimachinery/watch.go: "should receive events on concurrent watches in same order" test/e2e/apps/daemon_set.go: "should run and stop simple daemon" test/e2e/apps/daemon_set.go: "should run and stop complex daemon" test/e2e/apps/daemon_set.go: "should retry creating failed daemon pods" diff --git a/test/e2e/apimachinery/watch.go b/test/e2e/apimachinery/watch.go index 8b56bee08f5..fc2c0e03aab 100644 --- a/test/e2e/apimachinery/watch.go +++ b/test/e2e/apimachinery/watch.go @@ -321,11 +321,12 @@ var _ = SIGDescribe("Watchers", func() { /* Testname: watch-consistency + Release : v1.15 Description: Ensure that concurrent watches are consistent with each other by initiating an additional watch for events received from the first watch, initiated at the resource version of the event, and checking that all resource versions of all events match. Events are produced from writes on a background goroutine. */ - It("should receive events on concurrent watches in same order", func() { + framework.ConformanceIt("should receive events on concurrent watches in same order", func() { c := f.ClientSet ns := f.Namespace.Name