From adfe0ab52feea3898cf88f2d14f40fd0bd6e73a4 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Wed, 9 May 2018 18:00:33 -0400 Subject: [PATCH] Make aggregator e2e test resilient to unrelated API group changes --- test/e2e/apimachinery/aggregator.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/e2e/apimachinery/aggregator.go b/test/e2e/apimachinery/aggregator.go index 0aa64361680..d7924800bed 100644 --- a/test/e2e/apimachinery/aggregator.go +++ b/test/e2e/apimachinery/aggregator.go @@ -382,14 +382,13 @@ func TestSampleAPIServer(f *framework.Framework, image string) { flunderName = generateFlunderName("dynamic-flunder") // Rerun the Create/List/Delete tests using the Dynamic client. - resources, err := client.Discovery().ServerPreferredNamespacedResources() - framework.ExpectNoError(err, "getting server preferred namespaces resources for dynamic client") + resources, discoveryErr := client.Discovery().ServerPreferredNamespacedResources() groupVersionResources, err := discovery.GroupVersionResources(resources) framework.ExpectNoError(err, "getting group version resources for dynamic client") gvr := schema.GroupVersionResource{Group: "wardle.k8s.io", Version: "v1alpha1", Resource: "flunders"} _, ok := groupVersionResources[gvr] if !ok { - framework.Failf("could not find group version resource for dynamic client and wardle/flunders.") + framework.Failf("could not find group version resource for dynamic client and wardle/flunders (discovery error: %v, discovery results: %#v)", discoveryErr, groupVersionResources) } dynamicClient := f.DynamicClient.Resource(gvr).Namespace(namespace)