github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

use longer timeouts to avoid flakes on heavily loaded systems

Browse Source
This commit is contained in:
Alexander Zielenski 2023-03-21 14:18:34 -07:00
parent 0740b11073
commit 933dfe3a51
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/integration/apiserver/discovery/framework.go
View File

@ -43,6 +43,8 @@ import (
const acceptV1JSON = "application/json" const acceptV1JSON = "application/json"
const acceptV2JSON = "application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList" const acceptV2JSON = "application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList"
const maxTimeout = 10 * time.Second
type testClient interface { type testClient interface {
kubernetes.Interface kubernetes.Interface
aggregator.Interface aggregator.Interface
@ -143,7 +145,7 @@ func (a applyAPIService) Cleanup(ctx context.Context, client testClient) error {
err = wait.PollWithContext( err = wait.PollWithContext(
ctx, ctx,
250*time.Millisecond, 250*time.Millisecond,
1*time.Second, maxTimeout,
func(ctx context.Context) (done bool, err error) { func(ctx context.Context) (done bool, err error) {
_, err = client.ApiregistrationV1().APIServices().Get(ctx, name, metav1.GetOptions{}) _, err = client.ApiregistrationV1().APIServices().Get(ctx, name, metav1.GetOptions{})
if err == nil { if err == nil {
@ -211,7 +213,7 @@ func (a applyCRD) Cleanup(ctx context.Context, client testClient) error {
err = wait.PollWithContext( err = wait.PollWithContext(
ctx, ctx,
250*time.Millisecond, 250*time.Millisecond,
1*time.Second, maxTimeout,
func(ctx context.Context) (done bool, err error) { func(ctx context.Context) (done bool, err error) {
_, err = client.ApiextensionsV1().CustomResourceDefinitions().Get(ctx, name, metav1.GetOptions{}) _, err = client.ApiextensionsV1().CustomResourceDefinitions().Get(ctx, name, metav1.GetOptions{})
if err == nil { if err == nil {
@ -590,7 +592,7 @@ func WaitForResultWithCondition(ctx context.Context, client testClient, conditio
return wait.PollWithContext( return wait.PollWithContext(
ctx, ctx,
250*time.Millisecond, 250*time.Millisecond,
1*time.Second, maxTimeout,
func(ctx context.Context) (done bool, err error) { func(ctx context.Context) (done bool, err error) {
groupList, err := FetchV2Discovery(ctx, client) groupList, err := FetchV2Discovery(ctx, client)
if err != nil { if err != nil {
@ -611,7 +613,7 @@ func WaitForV1GroupsWithCondition(ctx context.Context, client testClient, condit
return wait.PollWithContext( return wait.PollWithContext(
ctx, ctx,
250*time.Millisecond, 250*time.Millisecond,
1*time.Second, maxTimeout,
func(ctx context.Context) (done bool, err error) { func(ctx context.Context) (done bool, err error) {
groupList, err := FetchV1DiscoveryGroups(ctx, client) groupList, err := FetchV1DiscoveryGroups(ctx, client)
@ -633,7 +635,7 @@ func WaitForV1ResourcesWithCondition(ctx context.Context, client testClient, gv
return wait.PollWithContext( return wait.PollWithContext(
ctx, ctx,
250*time.Millisecond, 250*time.Millisecond,
1*time.Second, maxTimeout,
func(ctx context.Context) (done bool, err error) { func(ctx context.Context) (done bool, err error) {
resourceList, err := FetchV1DiscoveryResource(ctx, client, gv) resourceList, err := FetchV1DiscoveryResource(ctx, client, gv)