diff --git a/test/conformance/testdata/conformance.txt b/test/conformance/testdata/conformance.txt index 8ce92e5ef19..cf523e09e0b 100644 --- a/test/conformance/testdata/conformance.txt +++ b/test/conformance/testdata/conformance.txt @@ -24,6 +24,7 @@ test/e2e/apps/deployment.go: "deployment should delete old replica sets" test/e2e/apps/deployment.go: "deployment should support rollover" test/e2e/apps/deployment.go: "deployment should support proportional scaling" test/e2e/apps/rc.go: "should serve a basic image on each replica with a public image" +test/e2e/apps/rc.go: "should surface a failure condition on a common issue like exceeded quota" test/e2e/apps/rc.go: "should adopt matching pods on creation" test/e2e/apps/rc.go: "should release no longer matching pods" test/e2e/apps/replica_set.go: "should serve a basic image on each replica with a public image" diff --git a/test/e2e/apps/rc.go b/test/e2e/apps/rc.go index 24b233c1ee5..c0af55043ef 100644 --- a/test/e2e/apps/rc.go +++ b/test/e2e/apps/rc.go @@ -56,7 +56,12 @@ var _ = SIGDescribe("ReplicationController", func() { TestReplicationControllerServeImageOrFail(f, "private", imageutils.GetE2EImage(privateimage)) }) - It("should surface a failure condition on a common issue like exceeded quota", func() { + /* + Release : v1.15 + Testname: Replication Controller, check for issues like exceeding allocated quota + Description: Attempt to create a Replication Controller with pods exceeding the namespace quota. The creation MUST fail + */ + framework.ConformanceIt("should surface a failure condition on a common issue like exceeded quota", func() { testReplicationControllerConditionCheck(f) })