diff --git a/test/e2e/BUILD b/test/e2e/BUILD index aa464bf5dcd..bb5531ab330 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -105,6 +105,7 @@ go_library( deps = [ "//federation/apis/federation/v1beta1:go_default_library", "//federation/client/clientset_generated/federation_release_1_5:go_default_library", + "//federation/client/clientset_generated/federation_release_1_5/typed/core/v1:go_default_library", "//federation/pkg/federation-controller/util:go_default_library", "//pkg/api:go_default_library", "//pkg/api/annotations:go_default_library", diff --git a/test/e2e/federated-namespace.go b/test/e2e/federated-namespace.go index a0b3339d299..30f16699032 100644 --- a/test/e2e/federated-namespace.go +++ b/test/e2e/federated-namespace.go @@ -158,22 +158,17 @@ func verifyNsCascadingDeletion(nsClient clientset.NamespaceInterface, deleteAllTestNamespaces(orphanDependents, nsClient.List, nsClient.Delete) By(fmt.Sprintf("Verifying namespaces %s in underlying clusters", nsName)) - fail := false + errMessages := []string{} for clusterName, clusterClientset := range clusters { _, err := clusterClientset.Core().Namespaces().Get(nsName) if orphanDependents && errors.IsNotFound(err) { - fail = true - // framework.Failf("unexpected NotFound error for namespace %s in cluster %s, expected namespace to exist", nsName, clusterName) - By(fmt.Sprintf("unexpected NotFound error for namespace %s in cluster %s, expected namespace to exist", nsName, clusterName)) + errMessages = append(errMessages, fmt.Sprintf("unexpected NotFound error for namespace %s in cluster %s, expected namespace to exist", nsName, clusterName)) } else if !orphanDependents && (err == nil || !errors.IsNotFound(err)) { - fail = true - By(fmt.Sprintf("expected NotFound error for namespace %s in cluster %s, got error: %v", nsName, clusterName, err)) - } else { - By(fmt.Sprintf("Woohoo!! Succeeded for cluster %s", clusterName)) + errMessages = append(errMessages, fmt.Sprintf("expected NotFound error for namespace %s in cluster %s, got error: %v", nsName, clusterName, err)) } } - if fail == true { - framework.Failf("Failed") + if len(errMessages) != 0 { + framework.Failf("%s", strings.Join(errMessages, "; ")) } } diff --git a/test/test_owners.csv b/test/test_owners.csv index fe2c129d709..dc48598d03c 100644 --- a/test/test_owners.csv +++ b/test/test_owners.csv @@ -139,7 +139,10 @@ Federation API server authentication should not accept cluster resources when th Federation apiserver Admission control should not be able to create resources if namespace does not exist,alex-mohr,1 Federation apiserver Cluster objects should be created and deleted successfully,ghodss,1 Federation events Event objects should be created and deleted successfully,karlkfi,1 +Federation namespace Namespace objects all resources in the namespace should be deleted when namespace is deleted,nikhiljindal,0 Federation namespace Namespace objects should be created and deleted successfully,xiang90,1 +Federation namespace Namespace objects should be deleted from underlying clusters when OrphanDependents is false,nikhiljindal,0 +Federation namespace Namespace objects should not be deleted from underlying clusters when OrphanDependents is true,nikhiljindal,0 Federation replicasets Federated ReplicaSet should create and update matching replicasets in underling clusters,childsb,1 Federation replicasets ReplicaSet objects should be created and deleted successfully,apelisse,1 Federation secrets Secret objects should be created and deleted successfully,pmorie,1