github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify Create/Delete-TestingNamespace functions

Browse Source
This commit is contained in:
Wojciech Tyczyński
2022-05-15 15:33:19 +02:00
parent 9720d130e4
commit deef9e40de
35 changed files with 326 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
test/integration/statefulset/statefulset_test.go
View File

@@ -123,10 +123,10 @@ func TestVolumeTemplateNoopUpdate(t *testing.T) {
}
func TestSpecReplicasChange(t *testing.T) {
s, closeFn, rm, informers, c := scSetup(t)
closeFn, rm, informers, c := scSetup(t)
defer closeFn()
ns := framework.CreateTestingNamespace("test-spec-replicas-change", s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace("test-spec-replicas-change", t)
defer framework.DeleteTestingNamespace(ns, t)
cancel := runControllerAndInformers(rm, informers)
defer cancel()
@@ -166,10 +166,10 @@ func TestSpecReplicasChange(t *testing.T) {
}
func TestDeletingAndFailedPods(t *testing.T) {
s, closeFn, rm, informers, c := scSetup(t)
closeFn, rm, informers, c := scSetup(t)
defer closeFn()
ns := framework.CreateTestingNamespace("test-deleting-and-failed-pods", s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace("test-deleting-and-failed-pods", t)
defer framework.DeleteTestingNamespace(ns, t)
cancel := runControllerAndInformers(rm, informers)
defer cancel()
@@ -267,10 +267,10 @@ func TestStatefulSetAvailable(t *testing.T) {
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.StatefulSetMinReadySeconds, test.enabled)()
s, closeFn, rm, informers, c := scSetup(t)
closeFn, rm, informers, c := scSetup(t)
defer closeFn()
ns := framework.CreateTestingNamespace("test-available-pods", s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace("test-available-pods", t)
defer framework.DeleteTestingNamespace(ns, t)
cancel := runControllerAndInformers(rm, informers)
defer cancel()
@@ -381,8 +381,8 @@ func TestStatefulSetStatusWithPodFail(t *testing.T) {
clientset.NewForConfigOrDie(restclient.AddUserAgent(&config, "statefulset-controller")),
)
ns := framework.CreateTestingNamespace("test-pod-fail", s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace("test-pod-fail", t)
defer framework.DeleteTestingNamespace(ns, t)
ctx, cancel := context.WithCancel(context.Background())
defer cancel()

5
test/integration/statefulset/util.go
View File

@@ -19,7 +19,6 @@ package statefulset
import (
"context"
"fmt"
"net/http/httptest"
"testing"
"time"
@@ -160,7 +159,7 @@ func newStatefulSetPVC(name string) v1.PersistentVolumeClaim {
}
// scSetup sets up necessities for Statefulset integration test, including control plane, apiserver, informers, and clientset
func scSetup(t *testing.T) (*httptest.Server, framework.CloseFunc, *statefulset.StatefulSetController, informers.SharedInformerFactory, clientset.Interface) {
func scSetup(t *testing.T) (framework.CloseFunc, *statefulset.StatefulSetController, informers.SharedInformerFactory, clientset.Interface) {
controlPlaneConfig := framework.NewIntegrationTestControlPlaneConfig()
_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
@@ -180,7 +179,7 @@ func scSetup(t *testing.T) (*httptest.Server, framework.CloseFunc, *statefulset.
clientset.NewForConfigOrDie(restclient.AddUserAgent(&config, "statefulset-controller")),
)
return s, closeFn, sc, informers, clientSet
return closeFn, sc, informers, clientSet
}
// Run STS controller and informers