Skip to content

Correct Failing E2E Tests #703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 6, 2025
Merged

Correct Failing E2E Tests #703

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7969118
Increase timeouts to address flaky E2E tests
rlymbur Feb 4, 2025
94b4bec
Added custom retryer for RAM tests
rlymbur Feb 5, 2025
6ccec1b
Merge branch 'aws:main' into 673
rlymbur Feb 5, 2025
678df9a
Merge branch 'aws:main' into 673
rlymbur Feb 5, 2025
e80b6fd
Use DefaultRetryer
rlymbur Feb 5, 2025
0e11187
Remove 3 maximum retry override
rlymbur Feb 6, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions test/suites/integration/access_log_policy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ var _ = Describe("Access Log Policy", Ordered, func() {
)

BeforeAll(func() {
SetDefaultEventuallyTimeout(5 * time.Minute)
SetDefaultEventuallyPollingInterval(10 * time.Second)

awsResourceName = awsResourceNamePrefix + utils.RandomAlphaString(10)

tags := testFramework.NewTestTags(testSuite)
Expand Down
2 changes: 1 addition & 1 deletion test/suites/integration/grpcroute_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ var _ = Describe("GRPCRoute test", Ordered, func() {
g.Expect(len(rules)).To(Equal(1))
g.Expect(*rules[0].Match.HttpMatch.Method).To(Equal("POST"))
g.Expect(*rules[0].Match.HttpMatch.PathMatch.Match.Prefix).To(Equal("/"))
}).Within(30 * time.Second).Should(Succeed())
}).Within(1 * time.Minute).Should(Succeed())
})

Context("Traffic test: client pod (grpcurl-runner) can send request to all services/methods of grpcBinService", func() {
Expand Down
18 changes: 16 additions & 2 deletions test/suites/integration/ram_share_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package integration

import (
"fmt"
awsClient "github.com/aws/aws-sdk-go/aws/client"
"os"
"strings"
"time"
Expand Down Expand Up @@ -50,7 +51,19 @@ var _ = Describe("RAM Share", Ordered, func() {
BeforeAll(func() {
secondaryTestRoleArn = os.Getenv("SECONDARY_ACCOUNT_TEST_ROLE_ARN")

primarySess := session.Must(session.NewSession(&aws.Config{Region: aws.String(config.Region)}))
retryer := awsClient.DefaultRetryer{
MinThrottleDelay: 1 * time.Second,
MinRetryDelay: 1 * time.Second,
MaxThrottleDelay: 5 * time.Second,
MaxRetryDelay: 5 * time.Second,
NumMaxRetries: 3,
Copy link

@iph iph Feb 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the default retries we are overriding?

I get that these are integration tests -- but 3 is "quite a bit".
Copy link
Contributor Author

@rlymbur rlymbur Feb 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The default retries is actually already three, probably best I remove it here to avoid any confusion. For some more context:

const (	// DefaultRetryerMaxNumRetries sets maximum number of retries	DefaultRetryerMaxNumRetries = 3	// DefaultRetryerMinRetryDelay sets minimum retry delay	DefaultRetryerMinRetryDelay = 30 * time.Millisecond	// DefaultRetryerMinThrottleDelay sets minimum delay when throttled	DefaultRetryerMinThrottleDelay = 500 * time.Millisecond	// DefaultRetryerMaxRetryDelay sets maximum retry delay	DefaultRetryerMaxRetryDelay = 300 * time.Second	// DefaultRetryerMaxThrottleDelay sets maximum delay when throttled	DefaultRetryerMaxThrottleDelay = 300 * time.Second )
}

primarySess := session.Must(session.NewSession(&aws.Config{
Region: aws.String(config.Region),
Retryer: retryer,
}))

stsClient := sts.New(primarySess)
assumeRoleInput := &sts.AssumeRoleInput{
RoleArn: aws.String(secondaryTestRoleArn),
Expand All @@ -63,7 +76,8 @@ var _ = Describe("RAM Share", Ordered, func() {
creds := assumeRoleResult.Credentials

secondarySess := session.Must(session.NewSession(&aws.Config{
Region: aws.String(config.Region),
Region: aws.String(config.Region),
Retryer: retryer,
Credentials: credentials.NewStaticCredentials(
*creds.AccessKeyId,
*creds.SecretAccessKey,
Expand Down