From 28a6a446a14d064d8a85c3e59b3c77f2127be35b Mon Sep 17 00:00:00 2001 From: Jonathan Basseri Date: Thu, 13 Dec 2018 18:44:39 -0800 Subject: [PATCH] Allow FeatureGate values to be overridden in benchmarks. This updates `SetFeatureGateDuringTest` to use the `testing.TB` interface, which matches *testing.T and *testing.B. --- .../pkg/util/feature/testing/feature_gate_testing.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/util/feature/testing/feature_gate_testing.go b/staging/src/k8s.io/apiserver/pkg/util/feature/testing/feature_gate_testing.go index 6b0a5fe8d3c..b4afc9ae716 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/feature/testing/feature_gate_testing.go +++ b/staging/src/k8s.io/apiserver/pkg/util/feature/testing/feature_gate_testing.go @@ -29,16 +29,16 @@ import ( // Example use: // // defer utilfeaturetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features., true)() -func SetFeatureGateDuringTest(t *testing.T, gate feature.FeatureGate, f feature.Feature, value bool) func() { +func SetFeatureGateDuringTest(tb testing.TB, gate feature.FeatureGate, f feature.Feature, value bool) func() { originalValue := gate.Enabled(f) if err := gate.(feature.MutableFeatureGate).Set(fmt.Sprintf("%s=%v", f, value)); err != nil { - t.Errorf("error setting %s=%v: %v", f, value, err) + tb.Errorf("error setting %s=%v: %v", f, value, err) } return func() { if err := gate.(feature.MutableFeatureGate).Set(fmt.Sprintf("%s=%v", f, originalValue)); err != nil { - t.Errorf("error restoring %s=%v: %v", f, originalValue, err) + tb.Errorf("error restoring %s=%v: %v", f, originalValue, err) } } }