From 0593746f6093a5a59a7a047f03a4139275fcaf11 Mon Sep 17 00:00:00 2001 From: Jefftree Date: Tue, 27 Feb 2024 18:27:54 -0500 Subject: [PATCH] Remove test for disabling aggregated discovery --- .../discovery/aggregated/wrapper_test.go | 51 ------------------- 1 file changed, 51 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/discovery/aggregated/wrapper_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/discovery/aggregated/wrapper_test.go index 78f11bc6394..6ad58d7ea53 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/discovery/aggregated/wrapper_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/discovery/aggregated/wrapper_test.go @@ -103,54 +103,3 @@ func TestAggregationEnabled(t *testing.T) { assert.Equal(t, tc.expected, body) } } - -func TestAggregationDisabled(t *testing.T) { - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.AggregatedDiscoveryEndpoint, false)() - - unaggregated := fakeHTTPHandler{data: "unaggregated"} - aggregated := fakeHTTPHandler{data: "aggregated"} - wrapped := WrapAggregatedDiscoveryToHandler(unaggregated, aggregated) - - testCases := []struct { - accept string - expected string - }{ - { - // Misconstructed/incorrect accept headers should be passed to the unaggregated handler to return an error - accept: "application/json;foo=bar", - expected: "unaggregated", - }, { - // Empty accept headers are valid and should be handled by the unaggregated handler - accept: "", - expected: "unaggregated", - }, { - - accept: aggregatedJSONAccept, - expected: "unaggregated", - }, { - accept: aggregatedProtoAccept, - expected: "unaggregated", - }, { - accept: jsonAccept, - expected: "unaggregated", - }, { - accept: protobufAccept, - expected: "unaggregated", - }, { - // Server should return the first accepted type. - // If aggregation is disabled, the unaggregated type should be returned. - accept: aggregatedJSONAccept + "," + jsonAccept, - expected: "unaggregated", - }, { - // Server should return the first accepted type. - // If aggregation is disabled, the unaggregated type should be returned. - accept: aggregatedProtoAccept + "," + protobufAccept, - expected: "unaggregated", - }, - } - - for _, tc := range testCases { - body := fetchPath(wrapped, discoveryPath, tc.accept) - assert.Equal(t, tc.expected, body) - } -}