From 32b9e31c230e5148589f1415e51bd84df23212f0 Mon Sep 17 00:00:00 2001 From: "Khaled (Kal) Henidak" Date: Wed, 10 Feb 2021 20:13:36 +0000 Subject: [PATCH] ammend tests to ensure feat gate is off when expected (beta: gate is always on) --- pkg/apis/core/v1/defaults_test.go | 9 +++++++++ pkg/kubelet/dockershim/network/cni/cni_test.go | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/pkg/apis/core/v1/defaults_test.go b/pkg/apis/core/v1/defaults_test.go index 1b8e7692b62..dd7221be695 100644 --- a/pkg/apis/core/v1/defaults_test.go +++ b/pkg/apis/core/v1/defaults_test.go @@ -1897,6 +1897,11 @@ func TestSetDefaultIPFamilies(t *testing.T) { } }) + // TODO: @khenidak + // with BETA feature is always on. This ensure we test for gate on/off scenarios + // as we move to stable this entire test will need to be folded into one test + defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.IPv6DualStack, false)() + // run without gate (families should not change) t.Run(fmt.Sprintf("without-gate:%s", test.name), func(t *testing.T) { obj2 := roundTrip(t, runtime.Object(&test.svc)) @@ -2039,6 +2044,10 @@ func TestSetDefaultServiceIPFamilyPolicy(t *testing.T) { // without gate. IPFamilyPolicy should never change t.Run(test.name, func(t *testing.T) { + //TODO: @khenidak + // BETA feature. gate is on. when we go stable fold the test into one scenario + defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.IPv6DualStack, false)() + obj2 := roundTrip(t, runtime.Object(&test.svc)) svc2 := obj2.(*v1.Service) diff --git a/pkg/kubelet/dockershim/network/cni/cni_test.go b/pkg/kubelet/dockershim/network/cni/cni_test.go index 06701bd95c3..c29e3695b2d 100644 --- a/pkg/kubelet/dockershim/network/cni/cni_test.go +++ b/pkg/kubelet/dockershim/network/cni/cni_test.go @@ -183,6 +183,15 @@ func TestCNIPlugin(t *testing.T) { }, }, cmd, args...) }, + func(cmd string, args ...string) exec.Cmd { + return fakeexec.InitFakeCmd(&fakeexec.FakeCmd{ + CombinedOutputScript: []fakeexec.FakeAction{ + func() ([]byte, []byte, error) { + return []byte(podIPOutput), nil, nil + }, + }, + }, cmd, args...) + }, } fexec := &fakeexec.FakeExec{