github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

integration: svm: use k8s ktesting package for test ctx init

Browse Source
This commit is contained in:
Stanislav Láznička 2025-02-19 15:10:37 +01:00
parent faf5b3ec76
commit e1557f80a2
No known key found for this signature in database
GPG Key ID: F8D8054395A1D157
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/integration/storageversionmigrator/storageversionmigrator_test.go
View File

@ -18,7 +18,6 @@ package storageversionmigrator
import ( import (
"bytes" "bytes"
"context"
"strconv" "strconv"
"sync" "sync"
"testing" "testing"
@ -34,9 +33,9 @@ import (
clientgofeaturegate "k8s.io/client-go/features" clientgofeaturegate "k8s.io/client-go/features"
"k8s.io/component-base/featuregate" "k8s.io/component-base/featuregate"
featuregatetesting "k8s.io/component-base/featuregate/testing" featuregatetesting "k8s.io/component-base/featuregate/testing"
"k8s.io/klog/v2/ktesting"
"k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/test/integration/framework" "k8s.io/kubernetes/test/integration/framework"
"k8s.io/kubernetes/test/utils/ktesting"
) )
// TestStorageVersionMigration is an integration test that verifies storage version migration works. // TestStorageVersionMigration is an integration test that verifies storage version migration works.
@ -56,9 +55,7 @@ func TestStorageVersionMigration(t *testing.T) {
// this makes the test super responsive. It's set to a default of 1 minute. // this makes the test super responsive. It's set to a default of 1 minute.
encryptionconfigcontroller.EncryptionConfigFileChangePollDuration = time.Second encryptionconfigcontroller.EncryptionConfigFileChangePollDuration = time.Second
_, ctx := ktesting.NewTestContext(t) ctx := ktesting.Init(t)
ctx, cancel := context.WithCancel(ctx)
defer cancel()
svmTest := svmSetup(ctx, t) svmTest := svmSetup(ctx, t)
@ -163,9 +160,7 @@ func TestStorageVersionMigrationWithCRD(t *testing.T) {
goleak.IgnoreTopFunction("github.com/moby/spdystream.(*Connection).shutdown"), goleak.IgnoreTopFunction("github.com/moby/spdystream.(*Connection).shutdown"),
) )
_, ctx := ktesting.NewTestContext(t) ctx := ktesting.Init(t)
ctx, cancel := context.WithCancel(ctx)
defer cancel()
crVersions := make(map[string]versions) crVersions := make(map[string]versions)
@ -291,9 +286,7 @@ func TestStorageVersionMigrationDuringChaos(t *testing.T) {
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.StorageVersionMigrator, true) featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.StorageVersionMigrator, true)
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, featuregate.Feature(clientgofeaturegate.InformerResourceVersion), true) featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, featuregate.Feature(clientgofeaturegate.InformerResourceVersion), true)
_, ctx := ktesting.NewTestContext(t) ctx := ktesting.Init(t)
ctx, cancel := context.WithCancel(ctx)
t.Cleanup(cancel)
svmTest := svmSetup(ctx, t) svmTest := svmSetup(ctx, t)