diff --git a/test/conformance/testdata/conformance.txt b/test/conformance/testdata/conformance.txt index 4b72cee5fc6..63669ecec5e 100755 --- a/test/conformance/testdata/conformance.txt +++ b/test/conformance/testdata/conformance.txt @@ -6,6 +6,8 @@ test/e2e/apimachinery/garbage_collector.go: "should orphan RS created by deploym test/e2e/apimachinery/garbage_collector.go: "should keep the rc around until all its pods are deleted if the deleteOptions says so" test/e2e/apimachinery/garbage_collector.go: "should not delete dependents that have both valid owner and owner that's waiting for dependents to be deleted" test/e2e/apimachinery/garbage_collector.go: "should not be blocked by dependency circle" +test/e2e/apimachinery/namespace.go: "should ensure that all pods are removed when a namespace is deleted" +test/e2e/apimachinery/namespace.go: "should ensure that all services are removed when a namespace is deleted" test/e2e/apimachinery/watch.go: "should observe add, update, and delete watch notifications on configmaps" 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" diff --git a/test/e2e/apimachinery/namespace.go b/test/e2e/apimachinery/namespace.go index b7aa78b919b..7f090baae69 100644 --- a/test/e2e/apimachinery/namespace.go +++ b/test/e2e/apimachinery/namespace.go @@ -262,10 +262,18 @@ var _ = SIGDescribe("Namespaces [Serial]", func() { f := framework.NewDefaultFramework("namespaces") - It("should ensure that all pods are removed when a namespace is deleted.", + /* + Testname: namespace-deletion-removes-pods + Description: Ensure that if a namespace is deleted then all pods are removed from that namespace. + */ + framework.ConformanceIt("should ensure that all pods are removed when a namespace is deleted", func() { ensurePodsAreRemovedWhenNamespaceIsDeleted(f) }) - It("should ensure that all services are removed when a namespace is deleted.", + /* + Testname: namespace-deletion-removes-services + Description: Ensure that if a namespace is deleted then all services are removed from that namespace. + */ + framework.ConformanceIt("should ensure that all services are removed when a namespace is deleted", func() { ensureServicesAreRemovedWhenNamespaceIsDeleted(f) }) It("should delete fast enough (90 percent of 100 namespaces in 150 seconds)",