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

e2e/apimachinery/watchlist: slighty refactor unstructured tests

Browse Source
This commit is contained in:
Lukasz Szaszkiewicz 2024-09-16 13:39:18 +02:00
parent 0912e400cd
commit 6d258660fd
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
test/e2e/apimachinery/watchlist.go
View File

@ -66,13 +66,7 @@ var _ = SIGDescribe("API Streaming (aka. WatchList)", framework.WithSerial(), fe
nil, nil,
) )
ginkgo.By(fmt.Sprintf("Adding 5 secrets to %s namespace", f.Namespace.Name)) expectedSecrets := addWellKnownSecrets(ctx, f)
var expectedSecrets []v1.Secret
for i := 1; i <= 5; i++ {
secret, err := f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Create(ctx, newSecret(fmt.Sprintf("secret-%d", i)), metav1.CreateOptions{})
framework.ExpectNoError(err)
expectedSecrets = append(expectedSecrets, *secret)
}
ginkgo.By("Starting the secret informer") ginkgo.By("Starting the secret informer")
go secretInformer.Run(stopCh) go secretInformer.Run(stopCh)
@ -99,13 +93,7 @@ var _ = SIGDescribe("API Streaming (aka. WatchList)", framework.WithSerial(), fe
ginkgo.It("should be requested by client-go's List method when WatchListClient is enabled", func(ctx context.Context) { ginkgo.It("should be requested by client-go's List method when WatchListClient is enabled", func(ctx context.Context) {
featuregatetesting.SetFeatureGateDuringTest(ginkgo.GinkgoTB(), utilfeature.DefaultFeatureGate, featuregate.Feature(clientfeatures.WatchListClient), true) featuregatetesting.SetFeatureGateDuringTest(ginkgo.GinkgoTB(), utilfeature.DefaultFeatureGate, featuregate.Feature(clientfeatures.WatchListClient), true)
ginkgo.By(fmt.Sprintf("Adding 5 secrets to %s namespace", f.Namespace.Name)) expectedSecrets := addWellKnownSecrets(ctx, f)
var expectedSecrets []v1.Secret
for i := 1; i <= 5; i++ {
secret, err := f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Create(ctx, newSecret(fmt.Sprintf("secret-%d", i)), metav1.CreateOptions{})
framework.ExpectNoError(err)
expectedSecrets = append(expectedSecrets, *secret)
}
rt, clientConfig := clientConfigWithRoundTripper(f) rt, clientConfig := clientConfigWithRoundTripper(f)
wrappedKubeClient, err := kubernetes.NewForConfig(clientConfig) wrappedKubeClient, err := kubernetes.NewForConfig(clientConfig)
@ -204,6 +192,17 @@ func getExpectedRequestMadeByClientFor(rv string) []string {
return expectedRequestMadeByClient return expectedRequestMadeByClient
} }
func addWellKnownSecrets(ctx context.Context, f *framework.Framework) []v1.Secret {
ginkgo.By(fmt.Sprintf("Adding 5 secrets to %s namespace", f.Namespace.Name))
var secrets []v1.Secret
for i := 1; i <= 5; i++ {
secret, err := f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Create(ctx, newSecret(fmt.Sprintf("secret-%d", i)), metav1.CreateOptions{})
framework.ExpectNoError(err)
secrets = append(secrets, *secret)
}
return secrets
}
type byName []v1.Secret type byName []v1.Secret
func (a byName) Len() int { return len(a) } func (a byName) Len() int { return len(a) }