diff --git a/test/suites/integration/access_log_policy_test.go b/test/suites/integration/access_log_policy_test.go index 64245b72..39385504 100644 --- a/test/suites/integration/access_log_policy_test.go +++ b/test/suites/integration/access_log_policy_test.go @@ -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) diff --git a/test/suites/integration/grpcroute_test.go b/test/suites/integration/grpcroute_test.go index 67562c6d..b5a70c08 100644 --- a/test/suites/integration/grpcroute_test.go +++ b/test/suites/integration/grpcroute_test.go @@ -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() { diff --git a/test/suites/integration/ram_share_test.go b/test/suites/integration/ram_share_test.go index 6f0b06a5..03006689 100644 --- a/test/suites/integration/ram_share_test.go +++ b/test/suites/integration/ram_share_test.go @@ -2,6 +2,7 @@ package integration import ( "fmt" + awsClient "github.com/aws/aws-sdk-go/aws/client" "os" "strings" "time" @@ -50,7 +51,18 @@ 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, + } + + 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), @@ -63,7 +75,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,