diff --git a/core/wait/wait_test.go b/core/wait/wait_test.go index 2e10d26ce..5abbf2fe1 100644 --- a/core/wait/wait_test.go +++ b/core/wait/wait_test.go @@ -5,6 +5,7 @@ import ( "fmt" "net/http" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -331,54 +332,56 @@ func TestWaitWithContext(t *testing.T) { }, } { t.Run(tt.desc, func(t *testing.T) { - type respType struct{} + synctest.Test(t, func(t *testing.T) { + type respType struct{} - numberCheckFnCalls := 0 - checkFn := func() (waitFinished bool, response *respType, err error) { - numberCheckFnCalls++ - if numberCheckFnCalls == tt.checkFnNumberCallsToFinishWait { - if tt.checkFnWaitSucceeds { - return true, &respType{}, nil + numberCheckFnCalls := 0 + checkFn := func() (waitFinished bool, response *respType, err error) { + numberCheckFnCalls++ + if numberCheckFnCalls == tt.checkFnNumberCallsToFinishWait { + if tt.checkFnWaitSucceeds { + return true, &respType{}, nil + } + return true, &respType{}, fmt.Errorf("the async action couldn't be done") } - return true, &respType{}, fmt.Errorf("the async action couldn't be done") - } - if numberCheckFnCalls < tt.checkFnNumberCallsUntilErr { - return false, nil, nil - } + if numberCheckFnCalls < tt.checkFnNumberCallsUntilErr { + return false, nil, nil + } - if tt.checkFnReturnsTempErr { - return false, nil, &oapierror.GenericOpenAPIError{ - StatusCode: RetryHttpErrorStatusCodes[0], - ErrorMessage: "something bad happened when checking if the async action was finished", + if tt.checkFnReturnsTempErr { + return false, nil, &oapierror.GenericOpenAPIError{ + StatusCode: RetryHttpErrorStatusCodes[0], + ErrorMessage: "something bad happened when checking if the async action was finished", + } } + return false, nil, fmt.Errorf("something bad happened when checking if the async action was finished") } - return false, nil, fmt.Errorf("something bad happened when checking if the async action was finished") - } - handler := AsyncActionHandler[respType]{ - checkFn: checkFn, - sleepBeforeWait: tt.handlerSleepBeforeWait, - throttle: tt.handlerThrottle, - timeout: tt.handlerTimeout, - tempErrRetryLimit: tt.handlerTempErrRetryLimit, - } - ctx, cancel := context.WithTimeout(context.Background(), tt.contextTimeout) - defer cancel() + handler := AsyncActionHandler[respType]{ + checkFn: checkFn, + sleepBeforeWait: tt.handlerSleepBeforeWait, + throttle: tt.handlerThrottle, + timeout: tt.handlerTimeout, + tempErrRetryLimit: tt.handlerTempErrRetryLimit, + } + ctx, cancel := context.WithTimeout(context.Background(), tt.contextTimeout) + defer cancel() - resp, err := handler.WaitWithContext(ctx) + resp, err := handler.WaitWithContext(ctx) - if tt.wantErr && (err == nil) { - t.Errorf("expected error but got none") - } - if !tt.wantErr && (err != nil) { - t.Errorf("expected no error but got \"%v\"", err) - } - if (err == nil) && (resp == nil) { - t.Errorf("got nil err but nil resp") - } - if numberCheckFnCalls != tt.wantCheckFnNumberCalls { - t.Errorf("expected %d calls to checkFn but got %d instead", tt.wantCheckFnNumberCalls, numberCheckFnCalls) - } + if tt.wantErr && (err == nil) { + t.Errorf("expected error but got none") + } + if !tt.wantErr && (err != nil) { + t.Errorf("expected no error but got \"%v\"", err) + } + if (err == nil) && (resp == nil) { + t.Errorf("got nil err but nil resp") + } + if numberCheckFnCalls != tt.wantCheckFnNumberCalls { + t.Errorf("expected %d calls to checkFn but got %d instead", tt.wantCheckFnNumberCalls, numberCheckFnCalls) + } + }) }) } } diff --git a/services/alb/v2api/wait/wait_test.go b/services/alb/v2api/wait/wait_test.go index 2cacd89ab..5d11e6a47 100644 --- a/services/alb/v2api/wait/wait_test.go +++ b/services/alb/v2api/wait/wait_test.go @@ -5,7 +5,7 @@ import ( "errors" "net/http" "testing" - "time" + "testing/synctest" "github.com/google/go-cmp/cmp" "github.com/google/uuid" @@ -109,23 +109,23 @@ func TestCreateOrUpdateLoadbalancerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - ctx := context.Background() - client := newAPIMock(&mockSettings{ - responses: tt.responses, - }) + synctest.Test(t, func(t *testing.T) { + ctx := context.Background() + client := newAPIMock(&mockSettings{ + responses: tt.responses, + }) - handler := CreateOrUpdateLoadbalancerWaitHandler(ctx, client, testProject, testRegion, testName) - got, err := handler.SetTimeout(1 * time.Second). - SetThrottle(250 * time.Millisecond). - WaitWithContext(ctx) + handler := CreateOrUpdateLoadbalancerWaitHandler(ctx, client, testProject, testRegion, testName) + got, err := handler.WaitWithContext(ctx) - if (err != nil) != tt.wantErr { - t.Fatalf("unexpected error response. want %v but got %qe ", tt.wantErr, err) - } + if (err != nil) != tt.wantErr { + t.Fatalf("unexpected error response. want %v but got %qe ", tt.wantErr, err) + } - if diff := cmp.Diff(tt.want, got); diff != "" { - t.Errorf("differing loadbalancer %s", diff) - } + if diff := cmp.Diff(tt.want, got); diff != "" { + t.Errorf("differing loadbalancer %s", diff) + } + }) }) } } @@ -193,25 +193,25 @@ func TestDeleteLoadbalancerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - ctx := context.Background() - client := newAPIMock(&mockSettings{ - responses: tt.responses, - }) + synctest.Test(t, func(t *testing.T) { + ctx := context.Background() + client := newAPIMock(&mockSettings{ + responses: tt.responses, + }) - handler := DeleteLoadbalancerWaitHandler(ctx, client, testProject, testRegion, testName) - _, err := handler.SetTimeout(1 * time.Second). - SetThrottle(250 * time.Millisecond). - WaitWithContext(ctx) + handler := DeleteLoadbalancerWaitHandler(ctx, client, testProject, testRegion, testName) + _, err := handler.WaitWithContext(ctx) - if tt.wantErr != (err != nil) { - t.Fatalf("wrong error result. want err: %v got %v", tt.wantErr, err) - } - if tt.wantErr { - var apiErr *oapierror.GenericOpenAPIError - if !errors.As(err, &apiErr) { - t.Fatalf("expected openapi error, got %v", err) + if tt.wantErr != (err != nil) { + t.Fatalf("wrong error result. want err: %v got %v", tt.wantErr, err) + } + if tt.wantErr { + var apiErr *oapierror.GenericOpenAPIError + if !errors.As(err, &apiErr) { + t.Fatalf("expected openapi error, got %v", err) + } } - } + }) }) } } diff --git a/services/alb/wait/wait_test.go b/services/alb/wait/wait_test.go index 5b5959291..c3f902c56 100644 --- a/services/alb/wait/wait_test.go +++ b/services/alb/wait/wait_test.go @@ -5,7 +5,7 @@ import ( "errors" "net/http" "testing" - "time" + "testing/synctest" "github.com/google/go-cmp/cmp" "github.com/google/uuid" @@ -98,22 +98,22 @@ func TestCreateOrUpdateLoadbalancerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - ctx := context.Background() - client := &apiClientLoadbalancerMocked{ - responses: tt.responses, - } - handler := CreateOrUpdateLoadbalancerWaitHandler(ctx, client, testProject, testRegion, testName) - got, err := handler.SetTimeout(1 * time.Second). - SetThrottle(250 * time.Millisecond). - WaitWithContext(ctx) + synctest.Test(t, func(t *testing.T) { + ctx := context.Background() + client := &apiClientLoadbalancerMocked{ + responses: tt.responses, + } + handler := CreateOrUpdateLoadbalancerWaitHandler(ctx, client, testProject, testRegion, testName) + got, err := handler.WaitWithContext(ctx) - if (err != nil) != tt.wantErr { - t.Fatalf("unexpected error response. want %v but got %qe ", tt.wantErr, err) - } + if (err != nil) != tt.wantErr { + t.Fatalf("unexpected error response. want %v but got %qe ", tt.wantErr, err) + } - if diff := cmp.Diff(tt.want, got); diff != "" { - t.Errorf("differing loadbalancer %s", diff) - } + if diff := cmp.Diff(tt.want, got); diff != "" { + t.Errorf("differing loadbalancer %s", diff) + } + }) }) } } @@ -181,24 +181,24 @@ func TestDeleteLoadbalancerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - ctx := context.Background() - client := &apiClientLoadbalancerMocked{ - responses: tt.responses, - } - handler := DeleteLoadbalancerWaitHandler(ctx, client, testProject, testRegion, testName) - _, err := handler.SetTimeout(1 * time.Second). - SetThrottle(250 * time.Millisecond). - WaitWithContext(ctx) + synctest.Test(t, func(t *testing.T) { + ctx := context.Background() + client := &apiClientLoadbalancerMocked{ + responses: tt.responses, + } + handler := DeleteLoadbalancerWaitHandler(ctx, client, testProject, testRegion, testName) + _, err := handler.WaitWithContext(ctx) - if tt.wantErr != (err != nil) { - t.Fatalf("wrong error result. want err: %v got %v", tt.wantErr, err) - } - if tt.wantErr { - var apiErr *oapierror.GenericOpenAPIError - if !errors.As(err, &apiErr) { - t.Fatalf("expected openapi error, got %v", err) + if tt.wantErr != (err != nil) { + t.Fatalf("wrong error result. want err: %v got %v", tt.wantErr, err) + } + if tt.wantErr { + var apiErr *oapierror.GenericOpenAPIError + if !errors.As(err, &apiErr) { + t.Fatalf("expected openapi error, got %v", err) + } } - } + }) }) } } diff --git a/services/cdn/v1api/wait/wait_test.go b/services/cdn/v1api/wait/wait_test.go index e865c0eb6..7500de772 100644 --- a/services/cdn/v1api/wait/wait_test.go +++ b/services/cdn/v1api/wait/wait_test.go @@ -6,6 +6,7 @@ import ( "net/http" "strings" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -173,12 +174,14 @@ func TestCreateDistributionWaitHandler(t *testing.T) { for name, tc := range tests { t.Run(name, func(t *testing.T) { - handler := CreateDistributionPoolWaitHandler(context.Background(), tc.apiClient, tc.projectId, tc.distributionId) - dist, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - tc.errCheck(t, err) - if diff := cmp.Diff(tc.expectedDistribution, dist, cmpopts.IgnoreUnexported(cdn.NullableString{}, cdn.NullableInt64{})); diff != "" { - t.Fatalf("Unexpected response (-want, +got):\n%s", diff) - } + synctest.Test(t, func(t *testing.T) { + handler := CreateDistributionPoolWaitHandler(context.Background(), tc.apiClient, tc.projectId, tc.distributionId) + dist, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + tc.errCheck(t, err) + if diff := cmp.Diff(tc.expectedDistribution, dist, cmpopts.IgnoreUnexported(cdn.NullableString{}, cdn.NullableInt64{})); diff != "" { + t.Fatalf("Unexpected response (-want, +got):\n%s", diff) + } + }) }) } } @@ -287,12 +290,14 @@ func TestDeleteDistributionWaitHandler(t *testing.T) { for name, tc := range tests { t.Run(name, func(t *testing.T) { - handler := DeleteDistributionWaitHandler(context.Background(), tc.apiClient, tc.projectId, tc.distributionId) - dist, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - tc.errCheck(t, err) - if dist != nil { - t.Fatalf("Distribution not deleted") - } + synctest.Test(t, func(t *testing.T) { + handler := DeleteDistributionWaitHandler(context.Background(), tc.apiClient, tc.projectId, tc.distributionId) + dist, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + tc.errCheck(t, err) + if dist != nil { + t.Fatalf("Distribution not deleted") + } + }) }) } } @@ -402,12 +407,14 @@ func TestUpdateDistributionWaitHandler(t *testing.T) { for name, tc := range tests { t.Run(name, func(t *testing.T) { - handler := UpdateDistributionWaitHandler(context.Background(), tc.apiClient, tc.projectId, tc.distributionId) - dist, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - tc.errCheck(t, err) - if diff := cmp.Diff(tc.expectedDistribution, dist, cmpopts.IgnoreUnexported(cdn.NullableString{}, cdn.NullableInt64{})); diff != "" { - t.Fatalf("Unexpected response (-want, +got):\n%s", diff) - } + synctest.Test(t, func(t *testing.T) { + handler := UpdateDistributionWaitHandler(context.Background(), tc.apiClient, tc.projectId, tc.distributionId) + dist, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + tc.errCheck(t, err) + if diff := cmp.Diff(tc.expectedDistribution, dist, cmpopts.IgnoreUnexported(cdn.NullableString{}, cdn.NullableInt64{})); diff != "" { + t.Fatalf("Unexpected response (-want, +got):\n%s", diff) + } + }) }) } } @@ -519,12 +526,14 @@ func TestCreateCustomDomainWaitHandler(t *testing.T) { for name, tc := range tests { t.Run(name, func(t *testing.T) { - handler := CreateCDNCustomDomainWaitHandler(context.Background(), tc.apiClient, tc.projectId, tc.distributionId, tc.customDomain) - customDomain, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - tc.errCheck(t, err) - if diff := cmp.Diff(tc.expectedCustomDomain, customDomain); diff != "" { - t.Fatalf("Unexpected response (-want, +got):\n%s", diff) - } + synctest.Test(t, func(t *testing.T) { + handler := CreateCDNCustomDomainWaitHandler(context.Background(), tc.apiClient, tc.projectId, tc.distributionId, tc.customDomain) + customDomain, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + tc.errCheck(t, err) + if diff := cmp.Diff(tc.expectedCustomDomain, customDomain); diff != "" { + t.Fatalf("Unexpected response (-want, +got):\n%s", diff) + } + }) }) } } @@ -640,12 +649,14 @@ func TestDeleteCustomDomainHandler(t *testing.T) { for name, tc := range tests { t.Run(name, func(t *testing.T) { - handler := DeleteCDNCustomDomainWaitHandler(context.Background(), tc.apiClient, tc.projectId, tc.distributionId, tc.customDomain) - customDomain, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - tc.errCheck(t, err) - if customDomain != nil { - t.Fatalf("Custom domain not deleted") - } + synctest.Test(t, func(t *testing.T) { + handler := DeleteCDNCustomDomainWaitHandler(context.Background(), tc.apiClient, tc.projectId, tc.distributionId, tc.customDomain) + customDomain, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + tc.errCheck(t, err) + if customDomain != nil { + t.Fatalf("Custom domain not deleted") + } + }) }) } } diff --git a/services/cdn/wait/wait_test.go b/services/cdn/wait/wait_test.go index f1237caa8..47168fb68 100644 --- a/services/cdn/wait/wait_test.go +++ b/services/cdn/wait/wait_test.go @@ -6,6 +6,7 @@ import ( "net/http" "strings" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -169,12 +170,14 @@ func TestCreateDistributionWaitHandler(t *testing.T) { for name, tc := range tests { t.Run(name, func(t *testing.T) { - handler := CreateDistributionPoolWaitHandler(context.Background(), tc.apiClient, tc.projectId, tc.distributionId) - dist, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - tc.errCheck(t, err) - if diff := cmp.Diff(tc.expectedDistribution, dist); diff != "" { - t.Fatalf("Unexpected response (-want, +got):\n%s", diff) - } + synctest.Test(t, func(t *testing.T) { + handler := CreateDistributionPoolWaitHandler(context.Background(), tc.apiClient, tc.projectId, tc.distributionId) + dist, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + tc.errCheck(t, err) + if diff := cmp.Diff(tc.expectedDistribution, dist); diff != "" { + t.Fatalf("Unexpected response (-want, +got):\n%s", diff) + } + }) }) } } @@ -299,12 +302,14 @@ func TestDeleteDistributionWaitHandler(t *testing.T) { for name, tc := range tests { t.Run(name, func(t *testing.T) { - handler := DeleteDistributionWaitHandler(context.Background(), tc.apiClient, tc.projectId, tc.distributionId) - dist, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - tc.errCheck(t, err) - if dist != nil { - t.Fatalf("Distribution not deleted") - } + synctest.Test(t, func(t *testing.T) { + handler := DeleteDistributionWaitHandler(context.Background(), tc.apiClient, tc.projectId, tc.distributionId) + dist, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + tc.errCheck(t, err) + if dist != nil { + t.Fatalf("Distribution not deleted") + } + }) }) } } @@ -414,12 +419,14 @@ func TestUpdateDistributionWaitHandler(t *testing.T) { for name, tc := range tests { t.Run(name, func(t *testing.T) { - handler := UpdateDistributionWaitHandler(context.Background(), tc.apiClient, tc.projectId, tc.distributionId) - dist, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - tc.errCheck(t, err) - if diff := cmp.Diff(tc.expectedDistribution, dist); diff != "" { - t.Fatalf("Unexpected response (-want, +got):\n%s", diff) - } + synctest.Test(t, func(t *testing.T) { + handler := UpdateDistributionWaitHandler(context.Background(), tc.apiClient, tc.projectId, tc.distributionId) + dist, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + tc.errCheck(t, err) + if diff := cmp.Diff(tc.expectedDistribution, dist); diff != "" { + t.Fatalf("Unexpected response (-want, +got):\n%s", diff) + } + }) }) } } @@ -530,12 +537,14 @@ func TestCreateCustomDomainWaitHandler(t *testing.T) { for name, tc := range tests { t.Run(name, func(t *testing.T) { - handler := CreateCDNCustomDomainWaitHandler(context.Background(), tc.apiClient, tc.projectId, tc.distributionId, tc.customDomain) - customDomain, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - tc.errCheck(t, err) - if diff := cmp.Diff(tc.expectedCustomDomain, customDomain); diff != "" { - t.Fatalf("Unexpected response (-want, +got):\n%s", diff) - } + synctest.Test(t, func(t *testing.T) { + handler := CreateCDNCustomDomainWaitHandler(context.Background(), tc.apiClient, tc.projectId, tc.distributionId, tc.customDomain) + customDomain, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + tc.errCheck(t, err) + if diff := cmp.Diff(tc.expectedCustomDomain, customDomain); diff != "" { + t.Fatalf("Unexpected response (-want, +got):\n%s", diff) + } + }) }) } } @@ -660,12 +669,14 @@ func TestDeleteCustomDomainHandler(t *testing.T) { for name, tc := range tests { t.Run(name, func(t *testing.T) { - handler := DeleteCDNCustomDomainWaitHandler(context.Background(), tc.apiClient, tc.projectId, tc.distributionId, tc.customDomain) - customDomain, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - tc.errCheck(t, err) - if customDomain != nil { - t.Fatalf("Custom domain not deleted") - } + synctest.Test(t, func(t *testing.T) { + handler := DeleteCDNCustomDomainWaitHandler(context.Background(), tc.apiClient, tc.projectId, tc.distributionId, tc.customDomain) + customDomain, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + tc.errCheck(t, err) + if customDomain != nil { + t.Fatalf("Custom domain not deleted") + } + }) }) } } diff --git a/services/dns/v1api/wait/wait_test.go b/services/dns/v1api/wait/wait_test.go index c4224efca..397f16b7e 100644 --- a/services/dns/v1api/wait/wait_test.go +++ b/services/dns/v1api/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -89,31 +90,33 @@ func TestCreateZoneWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newAPIMock(mockSettings{ - getFails: tt.getFails, - resourceState: tt.resourceState, - }) - - var wantRes *dns.ZoneResponse - if tt.wantResp { - wantRes = &dns.ZoneResponse{ - Zone: dns.Zone{ - State: tt.resourceState, - Id: "zid", - }, + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(mockSettings{ + getFails: tt.getFails, + resourceState: tt.resourceState, + }) + + var wantRes *dns.ZoneResponse + if tt.wantResp { + wantRes = &dns.ZoneResponse{ + Zone: dns.Zone{ + State: tt.resourceState, + Id: "zid", + }, + } } - } - handler := CreateZoneWaitHandler(context.Background(), apiClient, "pid", "zid") + handler := CreateZoneWaitHandler(context.Background(), apiClient, "pid", "zid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -157,31 +160,33 @@ func TestUpdateZoneWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newAPIMock(mockSettings{ - getFails: tt.getFails, - resourceState: tt.resourceState, - }) - - var wantRes *dns.ZoneResponse - if tt.wantResp { - wantRes = &dns.ZoneResponse{ - Zone: dns.Zone{ - State: tt.resourceState, - Id: "zid", - }, + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(mockSettings{ + getFails: tt.getFails, + resourceState: tt.resourceState, + }) + + var wantRes *dns.ZoneResponse + if tt.wantResp { + wantRes = &dns.ZoneResponse{ + Zone: dns.Zone{ + State: tt.resourceState, + Id: "zid", + }, + } } - } - handler := PartialUpdateZoneWaitHandler(context.Background(), apiClient, "pid", "zid") + handler := PartialUpdateZoneWaitHandler(context.Background(), apiClient, "pid", "zid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -225,33 +230,35 @@ func TestDeleteZoneWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newAPIMock(mockSettings{ - getFails: tt.getFails, - resourceState: tt.resourceState, - }) - - var wantRes *dns.ZoneResponse - if tt.wantResp { - wantRes = &dns.ZoneResponse{ - Zone: dns.Zone{ - State: tt.resourceState, - Id: "zid", - }, + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(mockSettings{ + getFails: tt.getFails, + resourceState: tt.resourceState, + }) + + var wantRes *dns.ZoneResponse + if tt.wantResp { + wantRes = &dns.ZoneResponse{ + Zone: dns.Zone{ + State: tt.resourceState, + Id: "zid", + }, + } + } else { + wantRes = nil } - } else { - wantRes = nil - } - handler := DeleteZoneWaitHandler(context.Background(), apiClient, "pid", "zid") + handler := DeleteZoneWaitHandler(context.Background(), apiClient, "pid", "zid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -295,31 +302,33 @@ func TestCreateRecordSetWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newAPIMock(mockSettings{ - getFails: tt.getFails, - resourceState: string(tt.resourceState), - }) - - var wantRes *dns.RecordSetResponse - if tt.wantResp { - wantRes = &dns.RecordSetResponse{ - Rrset: dns.RecordSet{ - State: tt.resourceState, - Id: "rid", - }, + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(mockSettings{ + getFails: tt.getFails, + resourceState: string(tt.resourceState), + }) + + var wantRes *dns.RecordSetResponse + if tt.wantResp { + wantRes = &dns.RecordSetResponse{ + Rrset: dns.RecordSet{ + State: tt.resourceState, + Id: "rid", + }, + } } - } - handler := CreateRecordSetWaitHandler(context.Background(), apiClient, "pid", "zid", "rid") + handler := CreateRecordSetWaitHandler(context.Background(), apiClient, "pid", "zid", "rid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -363,31 +372,33 @@ func TestUpdateRecordSetWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newAPIMock(mockSettings{ - getFails: tt.getFails, - resourceState: string(tt.resourceState), - }) - - var wantRes *dns.RecordSetResponse - if tt.wantResp { - wantRes = &dns.RecordSetResponse{ - Rrset: dns.RecordSet{ - State: tt.resourceState, - Id: "rid", - }, + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(mockSettings{ + getFails: tt.getFails, + resourceState: string(tt.resourceState), + }) + + var wantRes *dns.RecordSetResponse + if tt.wantResp { + wantRes = &dns.RecordSetResponse{ + Rrset: dns.RecordSet{ + State: tt.resourceState, + Id: "rid", + }, + } } - } - handler := PartialUpdateRecordSetWaitHandler(context.Background(), apiClient, "pid", "zid", "rid") + handler := PartialUpdateRecordSetWaitHandler(context.Background(), apiClient, "pid", "zid", "rid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -431,36 +442,38 @@ func TestDeleteRecordSetWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newAPIMock(mockSettings{ - getFails: tt.getFails, - resourceState: string(tt.resourceState), - }) - - var wantRes *dns.RecordSetResponse - if tt.wantResp { - wantRes = &dns.RecordSetResponse{ - Rrset: dns.RecordSet{ - State: tt.resourceState, - Id: "rid", - }, + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(mockSettings{ + getFails: tt.getFails, + resourceState: string(tt.resourceState), + }) + + var wantRes *dns.RecordSetResponse + if tt.wantResp { + wantRes = &dns.RecordSetResponse{ + Rrset: dns.RecordSet{ + State: tt.resourceState, + Id: "rid", + }, + } + } else { + wantRes = nil } - } else { - wantRes = nil - } - handler := DeleteRecordSetWaitHandler(context.Background(), apiClient, "pid", "zid", "rid") + handler := DeleteRecordSetWaitHandler(context.Background(), apiClient, "pid", "zid", "rid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if wantRes == nil && gotRes != nil { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } - if wantRes != nil && !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if wantRes == nil && gotRes != nil { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + if wantRes != nil && !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } diff --git a/services/dns/wait/wait_test.go b/services/dns/wait/wait_test.go index 92198ae65..080f2a756 100644 --- a/services/dns/wait/wait_test.go +++ b/services/dns/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -86,31 +87,33 @@ func TestCreateZoneWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getFails: tt.getFails, - resourceState: string(tt.resourceState), - } - - var wantRes *dns.ZoneResponse - if tt.wantResp { - wantRes = &dns.ZoneResponse{ - Zone: &dns.Zone{ - State: utils.Ptr(tt.resourceState), - Id: utils.Ptr("zid"), - }, + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getFails: tt.getFails, + resourceState: string(tt.resourceState), } - } - handler := CreateZoneWaitHandler(context.Background(), apiClient, "pid", "zid") + var wantRes *dns.ZoneResponse + if tt.wantResp { + wantRes = &dns.ZoneResponse{ + Zone: &dns.Zone{ + State: utils.Ptr(tt.resourceState), + Id: utils.Ptr("zid"), + }, + } + } + + handler := CreateZoneWaitHandler(context.Background(), apiClient, "pid", "zid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -154,31 +157,33 @@ func TestUpdateZoneWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getFails: tt.getFails, - resourceState: string(tt.resourceState), - } - - var wantRes *dns.ZoneResponse - if tt.wantResp { - wantRes = &dns.ZoneResponse{ - Zone: &dns.Zone{ - State: utils.Ptr(tt.resourceState), - Id: utils.Ptr("zid"), - }, + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getFails: tt.getFails, + resourceState: string(tt.resourceState), } - } - handler := PartialUpdateZoneWaitHandler(context.Background(), apiClient, "pid", "zid") + var wantRes *dns.ZoneResponse + if tt.wantResp { + wantRes = &dns.ZoneResponse{ + Zone: &dns.Zone{ + State: utils.Ptr(tt.resourceState), + Id: utils.Ptr("zid"), + }, + } + } + + handler := PartialUpdateZoneWaitHandler(context.Background(), apiClient, "pid", "zid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -222,33 +227,35 @@ func TestDeleteZoneWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getFails: tt.getFails, - resourceState: string(tt.resourceState), - } - - var wantRes *dns.ZoneResponse - if tt.wantResp { - wantRes = &dns.ZoneResponse{ - Zone: &dns.Zone{ - State: utils.Ptr(tt.resourceState), - Id: utils.Ptr("zid"), - }, + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getFails: tt.getFails, + resourceState: string(tt.resourceState), + } + + var wantRes *dns.ZoneResponse + if tt.wantResp { + wantRes = &dns.ZoneResponse{ + Zone: &dns.Zone{ + State: utils.Ptr(tt.resourceState), + Id: utils.Ptr("zid"), + }, + } + } else { + wantRes = nil } - } else { - wantRes = nil - } - handler := DeleteZoneWaitHandler(context.Background(), apiClient, "pid", "zid") + handler := DeleteZoneWaitHandler(context.Background(), apiClient, "pid", "zid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -292,31 +299,33 @@ func TestCreateRecordSetWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getFails: tt.getFails, - resourceState: string(tt.resourceState), - } - - var wantRes *dns.RecordSetResponse - if tt.wantResp { - wantRes = &dns.RecordSetResponse{ - Rrset: &dns.RecordSet{ - State: utils.Ptr(tt.resourceState), - Id: utils.Ptr("rid"), - }, + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getFails: tt.getFails, + resourceState: string(tt.resourceState), + } + + var wantRes *dns.RecordSetResponse + if tt.wantResp { + wantRes = &dns.RecordSetResponse{ + Rrset: &dns.RecordSet{ + State: utils.Ptr(tt.resourceState), + Id: utils.Ptr("rid"), + }, + } } - } - handler := CreateRecordSetWaitHandler(context.Background(), apiClient, "pid", "zid", "rid") + handler := CreateRecordSetWaitHandler(context.Background(), apiClient, "pid", "zid", "rid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -360,31 +369,33 @@ func TestUpdateRecordSetWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getFails: tt.getFails, - resourceState: string(tt.resourceState), - } - - var wantRes *dns.RecordSetResponse - if tt.wantResp { - wantRes = &dns.RecordSetResponse{ - Rrset: &dns.RecordSet{ - State: utils.Ptr(tt.resourceState), - Id: utils.Ptr("rid"), - }, + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getFails: tt.getFails, + resourceState: string(tt.resourceState), + } + + var wantRes *dns.RecordSetResponse + if tt.wantResp { + wantRes = &dns.RecordSetResponse{ + Rrset: &dns.RecordSet{ + State: utils.Ptr(tt.resourceState), + Id: utils.Ptr("rid"), + }, + } } - } - handler := PartialUpdateRecordSetWaitHandler(context.Background(), apiClient, "pid", "zid", "rid") + handler := PartialUpdateRecordSetWaitHandler(context.Background(), apiClient, "pid", "zid", "rid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -428,36 +439,38 @@ func TestDeleteRecordSetWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getFails: tt.getFails, - resourceState: string(tt.resourceState), - } - - var wantRes *dns.RecordSetResponse - if tt.wantResp { - wantRes = &dns.RecordSetResponse{ - Rrset: &dns.RecordSet{ - State: utils.Ptr(tt.resourceState), - Id: utils.Ptr("rid"), - }, + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getFails: tt.getFails, + resourceState: string(tt.resourceState), + } + + var wantRes *dns.RecordSetResponse + if tt.wantResp { + wantRes = &dns.RecordSetResponse{ + Rrset: &dns.RecordSet{ + State: utils.Ptr(tt.resourceState), + Id: utils.Ptr("rid"), + }, + } + } else { + wantRes = nil + } + + handler := DeleteRecordSetWaitHandler(context.Background(), apiClient, "pid", "zid", "rid") + + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if wantRes == nil && gotRes != nil { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + if wantRes != nil && !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) } - } else { - wantRes = nil - } - - handler := DeleteRecordSetWaitHandler(context.Background(), apiClient, "pid", "zid", "rid") - - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if wantRes == nil && gotRes != nil { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } - if wantRes != nil && !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + }) }) } } diff --git a/services/edge/v1beta1api/wait/wait_test.go b/services/edge/v1beta1api/wait/wait_test.go index 2e57c9c7f..a69f5d9c1 100644 --- a/services/edge/v1beta1api/wait/wait_test.go +++ b/services/edge/v1beta1api/wait/wait_test.go @@ -6,7 +6,7 @@ import ( "net/http" "strings" "testing" - "time" + "testing/synctest" "github.com/stackitcloud/stackit-sdk-go/core/oapierror" "github.com/stackitcloud/stackit-sdk-go/core/utils" @@ -247,31 +247,30 @@ func checkError(t *testing.T, gotErr, wantErr error) { } func executeHandlerAndGetError[T any](handler *wait.AsyncActionHandler[T]) error { - _, err := handler. - SetTimeout(20 * time.Millisecond). - SetThrottle(1 * time.Millisecond). - WaitWithContext(context.Background()) + _, err := handler.WaitWithContext(context.Background()) return err } func TestCreateOrUpdateInstanceWaitHandler(t *testing.T) { for _, tc := range createOrUpdateInstanceTests { t.Run(tc.desc, func(t *testing.T) { - settings := mockSettings{ - instanceStatus: tc.instanceStatus, - } + synctest.Test(t, func(t *testing.T) { + settings := mockSettings{ + instanceStatus: tc.instanceStatus, + } - if tc.shouldFail { - settings.instanceError = &oapierror.GenericOpenAPIError{ - StatusCode: http.StatusInternalServerError, + if tc.shouldFail { + settings.instanceError = &oapierror.GenericOpenAPIError{ + StatusCode: http.StatusInternalServerError, + } } - } - apiClient := newAPIMock(&settings) + apiClient := newAPIMock(&settings) - handler := CreateOrUpdateInstanceWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testInstanceId) - err := executeHandlerAndGetError(handler) - checkError(t, err, tc.wantErr) + handler := CreateOrUpdateInstanceWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testInstanceId) + err := executeHandlerAndGetError(handler) + checkError(t, err, tc.wantErr) + }) }) } } @@ -279,21 +278,23 @@ func TestCreateOrUpdateInstanceWaitHandler(t *testing.T) { func TestCreateOrUpdateInstanceByNameWaitHandler(t *testing.T) { for _, tc := range createOrUpdateInstanceTests { t.Run(tc.desc, func(t *testing.T) { - settings := mockSettings{ - instanceStatus: tc.instanceStatus, - } + synctest.Test(t, func(t *testing.T) { + settings := mockSettings{ + instanceStatus: tc.instanceStatus, + } - if tc.shouldFail { - settings.instanceError = &oapierror.GenericOpenAPIError{ - StatusCode: http.StatusInternalServerError, + if tc.shouldFail { + settings.instanceError = &oapierror.GenericOpenAPIError{ + StatusCode: http.StatusInternalServerError, + } } - } - apiClient := newAPIMock(&settings) + apiClient := newAPIMock(&settings) - handler := CreateOrUpdateInstanceByNameWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testName) - err := executeHandlerAndGetError(handler) - checkError(t, err, tc.wantErr) + handler := CreateOrUpdateInstanceByNameWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testName) + err := executeHandlerAndGetError(handler) + checkError(t, err, tc.wantErr) + }) }) } } @@ -301,13 +302,15 @@ func TestCreateOrUpdateInstanceByNameWaitHandler(t *testing.T) { func TestDeleteInstanceWaitHandler(t *testing.T) { for _, tc := range deleteInstanceTests { t.Run(tc.desc, func(t *testing.T) { - apiClient := newAPIMock(&mockSettings{ - deleteErrors: tc.errorsToReturn, + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(&mockSettings{ + deleteErrors: tc.errorsToReturn, + }) + + handler := DeleteInstanceWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testInstanceId) + err := executeHandlerAndGetError(handler) + checkError(t, err, tc.wantErr) }) - - handler := DeleteInstanceWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testInstanceId) - err := executeHandlerAndGetError(handler) - checkError(t, err, tc.wantErr) }) } } @@ -315,13 +318,15 @@ func TestDeleteInstanceWaitHandler(t *testing.T) { func TestDeleteInstanceByNameWaitHandler(t *testing.T) { for _, tc := range deleteInstanceTests { t.Run(tc.desc, func(t *testing.T) { - apiClient := newAPIMock(&mockSettings{ - deleteErrors: tc.errorsToReturn, + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(&mockSettings{ + deleteErrors: tc.errorsToReturn, + }) + + handler := DeleteInstanceByNameWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testName) + err := executeHandlerAndGetError(handler) + checkError(t, err, tc.wantErr) }) - - handler := DeleteInstanceByNameWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testName) - err := executeHandlerAndGetError(handler) - checkError(t, err, tc.wantErr) }) } } @@ -329,16 +334,18 @@ func TestDeleteInstanceByNameWaitHandler(t *testing.T) { func TestKubeconfigWaitHandler(t *testing.T) { for _, tc := range kubeconfigOrTokenTests { t.Run(tc.desc, func(t *testing.T) { - apiClient := newAPIMock(&mockSettings{ - instanceStatus: tc.instanceStatus, - instanceError: tc.instanceError, - resourceErrors: tc.errorsToReturn, - mockShouldTimeout: tc.mockShouldTimeout, + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(&mockSettings{ + instanceStatus: tc.instanceStatus, + instanceError: tc.instanceError, + resourceErrors: tc.errorsToReturn, + mockShouldTimeout: tc.mockShouldTimeout, + }) + + handler := KubeconfigWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testInstanceId, nil) + err := executeHandlerAndGetError(handler) + checkError(t, err, tc.wantErr) }) - - handler := KubeconfigWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testInstanceId, nil) - err := executeHandlerAndGetError(handler) - checkError(t, err, tc.wantErr) }) } } @@ -346,16 +353,18 @@ func TestKubeconfigWaitHandler(t *testing.T) { func TestKubeconfigByInstanceNameWaitHandler(t *testing.T) { for _, tc := range kubeconfigOrTokenTests { t.Run(tc.desc, func(t *testing.T) { - apiClient := newAPIMock(&mockSettings{ - instanceStatus: tc.instanceStatus, - instanceError: tc.instanceError, - resourceErrors: tc.errorsToReturn, - mockShouldTimeout: tc.mockShouldTimeout, + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(&mockSettings{ + instanceStatus: tc.instanceStatus, + instanceError: tc.instanceError, + resourceErrors: tc.errorsToReturn, + mockShouldTimeout: tc.mockShouldTimeout, + }) + + handler := KubeconfigByInstanceNameWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testName, nil) + err := executeHandlerAndGetError(handler) + checkError(t, err, tc.wantErr) }) - - handler := KubeconfigByInstanceNameWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testName, nil) - err := executeHandlerAndGetError(handler) - checkError(t, err, tc.wantErr) }) } } @@ -363,16 +372,18 @@ func TestKubeconfigByInstanceNameWaitHandler(t *testing.T) { func TestTokenWaitHandler(t *testing.T) { for _, tc := range kubeconfigOrTokenTests { t.Run(tc.desc, func(t *testing.T) { - apiClient := newAPIMock(&mockSettings{ - instanceStatus: tc.instanceStatus, - instanceError: tc.instanceError, - resourceErrors: tc.errorsToReturn, - mockShouldTimeout: tc.mockShouldTimeout, + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(&mockSettings{ + instanceStatus: tc.instanceStatus, + instanceError: tc.instanceError, + resourceErrors: tc.errorsToReturn, + mockShouldTimeout: tc.mockShouldTimeout, + }) + + handler := TokenWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testInstanceId, nil) + err := executeHandlerAndGetError(handler) + checkError(t, err, tc.wantErr) }) - - handler := TokenWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testInstanceId, nil) - err := executeHandlerAndGetError(handler) - checkError(t, err, tc.wantErr) }) } } @@ -380,16 +391,18 @@ func TestTokenWaitHandler(t *testing.T) { func TestTokenByInstanceNameWaitHandler(t *testing.T) { for _, tc := range kubeconfigOrTokenTests { t.Run(tc.desc, func(t *testing.T) { - apiClient := newAPIMock(&mockSettings{ - instanceStatus: tc.instanceStatus, - instanceError: tc.instanceError, - resourceErrors: tc.errorsToReturn, - mockShouldTimeout: tc.mockShouldTimeout, + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(&mockSettings{ + instanceStatus: tc.instanceStatus, + instanceError: tc.instanceError, + resourceErrors: tc.errorsToReturn, + mockShouldTimeout: tc.mockShouldTimeout, + }) + + handler := TokenByInstanceNameWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testName, nil) + err := executeHandlerAndGetError(handler) + checkError(t, err, tc.wantErr) }) - - handler := TokenByInstanceNameWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testName, nil) - err := executeHandlerAndGetError(handler) - checkError(t, err, tc.wantErr) }) } } diff --git a/services/edge/wait/wait_test.go b/services/edge/wait/wait_test.go index f6ca6745e..23f7a9989 100644 --- a/services/edge/wait/wait_test.go +++ b/services/edge/wait/wait_test.go @@ -6,7 +6,7 @@ import ( "net/http" "strings" "testing" - "time" + "testing/synctest" "github.com/stackitcloud/stackit-sdk-go/core/oapierror" "github.com/stackitcloud/stackit-sdk-go/core/wait" @@ -291,27 +291,26 @@ func checkError(t *testing.T, gotErr, wantErr error) { } func executeHandlerAndGetError[T any](handler *wait.AsyncActionHandler[T]) error { - _, err := handler. - SetTimeout(20 * time.Millisecond). - SetThrottle(1 * time.Millisecond). - WaitWithContext(context.Background()) + _, err := handler.WaitWithContext(context.Background()) return err } func TestCreateOrUpdateInstanceWaitHandler(t *testing.T) { for _, tc := range createOrUpdateInstanceTests { t.Run(tc.desc, func(t *testing.T) { - apiClient := &mockApiClient{ - instanceStatus: tc.instanceStatus, - } - if tc.shouldFail { - apiClient.instanceError = &oapierror.GenericOpenAPIError{ - StatusCode: http.StatusInternalServerError, + synctest.Test(t, func(t *testing.T) { + apiClient := &mockApiClient{ + instanceStatus: tc.instanceStatus, } - } - handler := CreateOrUpdateInstanceWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testInstanceId) - err := executeHandlerAndGetError(handler) - checkError(t, err, tc.wantErr) + if tc.shouldFail { + apiClient.instanceError = &oapierror.GenericOpenAPIError{ + StatusCode: http.StatusInternalServerError, + } + } + handler := CreateOrUpdateInstanceWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testInstanceId) + err := executeHandlerAndGetError(handler) + checkError(t, err, tc.wantErr) + }) }) } } @@ -319,17 +318,19 @@ func TestCreateOrUpdateInstanceWaitHandler(t *testing.T) { func TestCreateOrUpdateInstanceByNameWaitHandler(t *testing.T) { for _, tc := range createOrUpdateInstanceTests { t.Run(tc.desc, func(t *testing.T) { - apiClient := &mockApiClient{ - instanceStatus: tc.instanceStatus, - } - if tc.shouldFail { - apiClient.instanceError = &oapierror.GenericOpenAPIError{ - StatusCode: http.StatusInternalServerError, + synctest.Test(t, func(t *testing.T) { + apiClient := &mockApiClient{ + instanceStatus: tc.instanceStatus, + } + if tc.shouldFail { + apiClient.instanceError = &oapierror.GenericOpenAPIError{ + StatusCode: http.StatusInternalServerError, + } } - } - handler := CreateOrUpdateInstanceByNameWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testName) - err := executeHandlerAndGetError(handler) - checkError(t, err, tc.wantErr) + handler := CreateOrUpdateInstanceByNameWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testName) + err := executeHandlerAndGetError(handler) + checkError(t, err, tc.wantErr) + }) }) } } @@ -337,12 +338,14 @@ func TestCreateOrUpdateInstanceByNameWaitHandler(t *testing.T) { func TestDeleteInstanceWaitHandler(t *testing.T) { for _, tc := range deleteInstanceTests { t.Run(tc.desc, func(t *testing.T) { - apiClient := &mockApiClient{ - deleteErrors: tc.errorsToReturn, - } - handler := DeleteInstanceWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testInstanceId) - err := executeHandlerAndGetError(handler) - checkError(t, err, tc.wantErr) + synctest.Test(t, func(t *testing.T) { + apiClient := &mockApiClient{ + deleteErrors: tc.errorsToReturn, + } + handler := DeleteInstanceWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testInstanceId) + err := executeHandlerAndGetError(handler) + checkError(t, err, tc.wantErr) + }) }) } } @@ -350,12 +353,14 @@ func TestDeleteInstanceWaitHandler(t *testing.T) { func TestDeleteInstanceByNameWaitHandler(t *testing.T) { for _, tc := range deleteInstanceTests { t.Run(tc.desc, func(t *testing.T) { - apiClient := &mockApiClient{ - deleteErrors: tc.errorsToReturn, - } - handler := DeleteInstanceByNameWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testName) - err := executeHandlerAndGetError(handler) - checkError(t, err, tc.wantErr) + synctest.Test(t, func(t *testing.T) { + apiClient := &mockApiClient{ + deleteErrors: tc.errorsToReturn, + } + handler := DeleteInstanceByNameWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testName) + err := executeHandlerAndGetError(handler) + checkError(t, err, tc.wantErr) + }) }) } } @@ -363,15 +368,17 @@ func TestDeleteInstanceByNameWaitHandler(t *testing.T) { func TestKubeconfigWaitHandler(t *testing.T) { for _, tc := range kubeconfigOrTokenTests { t.Run(tc.desc, func(t *testing.T) { - apiClient := &mockApiClient{ - instanceStatus: tc.instanceStatus, - instanceError: tc.instanceError, - resourceErrors: tc.errorsToReturn, - mockShouldTimeout: tc.mockShouldTimeout, - } - handler := KubeconfigWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testInstanceId, nil) - err := executeHandlerAndGetError(handler) - checkError(t, err, tc.wantErr) + synctest.Test(t, func(t *testing.T) { + apiClient := &mockApiClient{ + instanceStatus: tc.instanceStatus, + instanceError: tc.instanceError, + resourceErrors: tc.errorsToReturn, + mockShouldTimeout: tc.mockShouldTimeout, + } + handler := KubeconfigWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testInstanceId, nil) + err := executeHandlerAndGetError(handler) + checkError(t, err, tc.wantErr) + }) }) } } @@ -379,15 +386,17 @@ func TestKubeconfigWaitHandler(t *testing.T) { func TestKubeconfigByInstanceNameWaitHandler(t *testing.T) { for _, tc := range kubeconfigOrTokenTests { t.Run(tc.desc, func(t *testing.T) { - apiClient := &mockApiClient{ - instanceStatus: tc.instanceStatus, - instanceError: tc.instanceError, - resourceErrors: tc.errorsToReturn, - mockShouldTimeout: tc.mockShouldTimeout, - } - handler := KubeconfigByInstanceNameWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testName, nil) - err := executeHandlerAndGetError(handler) - checkError(t, err, tc.wantErr) + synctest.Test(t, func(t *testing.T) { + apiClient := &mockApiClient{ + instanceStatus: tc.instanceStatus, + instanceError: tc.instanceError, + resourceErrors: tc.errorsToReturn, + mockShouldTimeout: tc.mockShouldTimeout, + } + handler := KubeconfigByInstanceNameWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testName, nil) + err := executeHandlerAndGetError(handler) + checkError(t, err, tc.wantErr) + }) }) } } @@ -395,15 +404,17 @@ func TestKubeconfigByInstanceNameWaitHandler(t *testing.T) { func TestTokenWaitHandler(t *testing.T) { for _, tc := range kubeconfigOrTokenTests { t.Run(tc.desc, func(t *testing.T) { - apiClient := &mockApiClient{ - instanceStatus: tc.instanceStatus, - instanceError: tc.instanceError, - resourceErrors: tc.errorsToReturn, - mockShouldTimeout: tc.mockShouldTimeout, - } - handler := TokenWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testInstanceId, nil) - err := executeHandlerAndGetError(handler) - checkError(t, err, tc.wantErr) + synctest.Test(t, func(t *testing.T) { + apiClient := &mockApiClient{ + instanceStatus: tc.instanceStatus, + instanceError: tc.instanceError, + resourceErrors: tc.errorsToReturn, + mockShouldTimeout: tc.mockShouldTimeout, + } + handler := TokenWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testInstanceId, nil) + err := executeHandlerAndGetError(handler) + checkError(t, err, tc.wantErr) + }) }) } } @@ -411,15 +422,17 @@ func TestTokenWaitHandler(t *testing.T) { func TestTokenByInstanceNameWaitHandler(t *testing.T) { for _, tc := range kubeconfigOrTokenTests { t.Run(tc.desc, func(t *testing.T) { - apiClient := &mockApiClient{ - instanceStatus: tc.instanceStatus, - instanceError: tc.instanceError, - resourceErrors: tc.errorsToReturn, - mockShouldTimeout: tc.mockShouldTimeout, - } - handler := TokenByInstanceNameWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testName, nil) - err := executeHandlerAndGetError(handler) - checkError(t, err, tc.wantErr) + synctest.Test(t, func(t *testing.T) { + apiClient := &mockApiClient{ + instanceStatus: tc.instanceStatus, + instanceError: tc.instanceError, + resourceErrors: tc.errorsToReturn, + mockShouldTimeout: tc.mockShouldTimeout, + } + handler := TokenByInstanceNameWaitHandler(context.Background(), apiClient, testProjectId, testRegion, testName, nil) + err := executeHandlerAndGetError(handler) + checkError(t, err, tc.wantErr) + }) }) } } diff --git a/services/git/v1betaapi/wait/wait_test.go b/services/git/v1betaapi/wait/wait_test.go index 5de3ae406..ca040ad55 100644 --- a/services/git/v1betaapi/wait/wait_test.go +++ b/services/git/v1betaapi/wait/wait_test.go @@ -4,6 +4,7 @@ import ( "context" "net/http" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -142,30 +143,32 @@ func TestCreateGitInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newAPIMock(&mockSettings{ - getFails: tt.getFails, - projectId: tt.projectId, - instanceId: tt.instanceId, - getGitResponse: tt.getGitResponse, - returnInstance: tt.returnInstance, - }) - - var instanceWanted *git.Instance - if tt.wantResp { - instanceWanted = tt.getGitResponse - } + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(&mockSettings{ + getFails: tt.getFails, + projectId: tt.projectId, + instanceId: tt.instanceId, + getGitResponse: tt.getGitResponse, + returnInstance: tt.returnInstance, + }) + + var instanceWanted *git.Instance + if tt.wantResp { + instanceWanted = tt.getGitResponse + } - handler := CreateGitInstanceWaitHandler(context.Background(), apiClient, tt.projectId, tt.instanceId) + handler := CreateGitInstanceWaitHandler(context.Background(), apiClient, tt.projectId, tt.instanceId) - response, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + response, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } - if !cmp.Equal(response, instanceWanted, cmp.AllowUnexported(git.NullableString{}, git.NullableBool{})) { - t.Fatalf("handler gotRes = %v, want %v", response, instanceWanted) - } + if !cmp.Equal(response, instanceWanted, cmp.AllowUnexported(git.NullableString{}, git.NullableBool{})) { + t.Fatalf("handler gotRes = %v, want %v", response, instanceWanted) + } + }) }) } } @@ -212,27 +215,29 @@ func TestDeleteGitInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - projectId := uuid.New().String() - instanceId := uuid.New().String() - - apiClient := newAPIMock(&mockSettings{ - projectId: projectId, - getFails: tt.getFails, - errorCode: tt.errorCode, - returnInstance: tt.returnInstance, - getGitResponse: tt.getGitResponse, - }) - - handler := DeleteGitInstanceWaitHandler(context.Background(), apiClient, projectId, instanceId) - response, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + synctest.Test(t, func(t *testing.T) { + projectId := uuid.New().String() + instanceId := uuid.New().String() + + apiClient := newAPIMock(&mockSettings{ + projectId: projectId, + getFails: tt.getFails, + errorCode: tt.errorCode, + returnInstance: tt.returnInstance, + getGitResponse: tt.getGitResponse, + }) + + handler := DeleteGitInstanceWaitHandler(context.Background(), apiClient, projectId, instanceId) + response, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } - if (response != nil) != tt.wantReturnedInstance { - t.Fatalf("handler gotRes = %v, want nil", response) - } + if (response != nil) != tt.wantReturnedInstance { + t.Fatalf("handler gotRes = %v, want nil", response) + } + }) }) } } diff --git a/services/git/wait/wait_test.go b/services/git/wait/wait_test.go index a8c9b49d8..cfbafab7a 100644 --- a/services/git/wait/wait_test.go +++ b/services/git/wait/wait_test.go @@ -4,6 +4,7 @@ import ( "context" "net/http" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -136,28 +137,30 @@ func TestCreateGitInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getFails: tt.getFails, - projectId: tt.projectId, - instanceId: tt.instanceId, - getGitResponse: tt.getGitResponse, - returnInstance: tt.returnInstance, - } - var instanceWanted *git.Instance - if tt.wantResp { - instanceWanted = tt.getGitResponse - } - - handler := CreateGitInstanceWaitHandler(context.Background(), apiClient, apiClient.projectId, apiClient.instanceId) - - response, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(response, instanceWanted) { - t.Fatalf("handler gotRes = %v, want %v", response, instanceWanted) - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getFails: tt.getFails, + projectId: tt.projectId, + instanceId: tt.instanceId, + getGitResponse: tt.getGitResponse, + returnInstance: tt.returnInstance, + } + var instanceWanted *git.Instance + if tt.wantResp { + instanceWanted = tt.getGitResponse + } + + handler := CreateGitInstanceWaitHandler(context.Background(), apiClient, apiClient.projectId, apiClient.instanceId) + + response, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(response, instanceWanted) { + t.Fatalf("handler gotRes = %v, want %v", response, instanceWanted) + } + }) }) } } @@ -204,24 +207,26 @@ func TestDeleteGitInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - - projectId: uuid.New().String(), - getFails: tt.getFails, - errorCode: tt.errorCode, - returnInstance: tt.returnInstance, - getGitResponse: tt.getGitResponse, - } - - handler := DeleteGitInstanceWaitHandler(context.Background(), apiClient, apiClient.projectId, apiClient.instanceId) - response, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if (response != nil) != tt.wantReturnedInstance { - t.Fatalf("handler gotRes = %v, want nil", response) - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + + projectId: uuid.New().String(), + getFails: tt.getFails, + errorCode: tt.errorCode, + returnInstance: tt.returnInstance, + getGitResponse: tt.getGitResponse, + } + + handler := DeleteGitInstanceWaitHandler(context.Background(), apiClient, apiClient.projectId, apiClient.instanceId) + response, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if (response != nil) != tt.wantReturnedInstance { + t.Fatalf("handler gotRes = %v, want nil", response) + } + }) }) } } diff --git a/services/iaas/v2api/wait/wait_test.go b/services/iaas/v2api/wait/wait_test.go index 6bbfe2966..1846992ce 100644 --- a/services/iaas/v2api/wait/wait_test.go +++ b/services/iaas/v2api/wait/wait_test.go @@ -4,6 +4,7 @@ import ( "context" "net/http" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -284,29 +285,31 @@ func TestCreateNetworkWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newIaaSAPIMock(&iaasMockSettings{ - getNetworkFails: tt.getFails, - resourceState: tt.resourceState, - }) - - var wantRes *iaas.Network - if tt.wantResp { - wantRes = &iaas.Network{ - Id: "nid", - Status: tt.resourceState, + synctest.Test(t, func(t *testing.T) { + apiClient := newIaaSAPIMock(&iaasMockSettings{ + getNetworkFails: tt.getFails, + resourceState: tt.resourceState, + }) + + var wantRes *iaas.Network + if tt.wantResp { + wantRes = &iaas.Network{ + Id: "nid", + Status: tt.resourceState, + } } - } - handler := CreateNetworkWaitHandler(context.Background(), apiClient, "pid", "region", "nid") + handler := CreateNetworkWaitHandler(context.Background(), apiClient, "pid", "region", "nid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -343,29 +346,31 @@ func TestUpdateNetworkWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newIaaSAPIMock(&iaasMockSettings{ - getNetworkFails: tt.getFails, - resourceState: tt.resourceState, - }) - - var wantRes *iaas.Network - if tt.wantResp { - wantRes = &iaas.Network{ - Id: "nid", - Status: tt.resourceState, + synctest.Test(t, func(t *testing.T) { + apiClient := newIaaSAPIMock(&iaasMockSettings{ + getNetworkFails: tt.getFails, + resourceState: tt.resourceState, + }) + + var wantRes *iaas.Network + if tt.wantResp { + wantRes = &iaas.Network{ + Id: "nid", + Status: tt.resourceState, + } } - } - handler := UpdateNetworkWaitHandler(context.Background(), apiClient, "pid", "region", "nid") + handler := UpdateNetworkWaitHandler(context.Background(), apiClient, "pid", "region", "nid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -403,30 +408,32 @@ func TestDeleteNetworkWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newIaaSAPIMock(&iaasMockSettings{ - getNetworkFails: tt.getFails, - isDeleted: tt.isDeleted, - resourceState: tt.resourceState, - }) - - var wantRes *iaas.Network - if tt.wantResp { - wantRes = &iaas.Network{ - Id: "nid", - Status: tt.resourceState, + synctest.Test(t, func(t *testing.T) { + apiClient := newIaaSAPIMock(&iaasMockSettings{ + getNetworkFails: tt.getFails, + isDeleted: tt.isDeleted, + resourceState: tt.resourceState, + }) + + var wantRes *iaas.Network + if tt.wantResp { + wantRes = &iaas.Network{ + Id: "nid", + Status: tt.resourceState, + } } - } - handler := DeleteNetworkWaitHandler(context.Background(), apiClient, "pid", "region", "nid") + handler := DeleteNetworkWaitHandler(context.Background(), apiClient, "pid", "region", "nid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -470,29 +477,31 @@ func TestCreateVolumeWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newIaaSAPIMock(&iaasMockSettings{ - getVolumeFails: tt.getFails, - resourceState: tt.resourceState, - }) - - var wantRes *iaas.Volume - if tt.wantResp { - wantRes = &iaas.Volume{ - Id: utils.Ptr("vid"), - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + apiClient := newIaaSAPIMock(&iaasMockSettings{ + getVolumeFails: tt.getFails, + resourceState: tt.resourceState, + }) + + var wantRes *iaas.Volume + if tt.wantResp { + wantRes = &iaas.Volume{ + Id: utils.Ptr("vid"), + Status: utils.Ptr(tt.resourceState), + } } - } - handler := CreateVolumeWaitHandler(context.Background(), apiClient, "pid", "region", "vid") + handler := CreateVolumeWaitHandler(context.Background(), apiClient, "pid", "region", "vid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -530,30 +539,32 @@ func TestDeleteVolumeWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newIaaSAPIMock(&iaasMockSettings{ - getVolumeFails: tt.getFails, - isDeleted: tt.isDeleted, - resourceState: tt.resourceState, - }) - - var wantRes *iaas.Volume - if tt.wantResp { - wantRes = &iaas.Volume{ - Id: utils.Ptr("vid"), - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + apiClient := newIaaSAPIMock(&iaasMockSettings{ + getVolumeFails: tt.getFails, + isDeleted: tt.isDeleted, + resourceState: tt.resourceState, + }) + + var wantRes *iaas.Volume + if tt.wantResp { + wantRes = &iaas.Volume{ + Id: utils.Ptr("vid"), + Status: utils.Ptr(tt.resourceState), + } } - } - handler := DeleteVolumeWaitHandler(context.Background(), apiClient, "pid", "region", "vid") + handler := DeleteVolumeWaitHandler(context.Background(), apiClient, "pid", "region", "vid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -597,29 +608,31 @@ func TestCreateServerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newIaaSAPIMock(&iaasMockSettings{ - getServerFails: tt.getFails, - resourceState: tt.resourceState, - }) - - var wantRes *iaas.Server - if tt.wantResp { - wantRes = &iaas.Server{ - Id: utils.Ptr("sid"), - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + apiClient := newIaaSAPIMock(&iaasMockSettings{ + getServerFails: tt.getFails, + resourceState: tt.resourceState, + }) + + var wantRes *iaas.Server + if tt.wantResp { + wantRes = &iaas.Server{ + Id: utils.Ptr("sid"), + Status: utils.Ptr(tt.resourceState), + } } - } - handler := CreateServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") + handler := CreateServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -657,30 +670,32 @@ func TestDeleteServerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newIaaSAPIMock(&iaasMockSettings{ - getServerFails: tt.getFails, - isDeleted: tt.isDeleted, - resourceState: tt.resourceState, - }) - - var wantRes *iaas.Server - if tt.wantResp { - wantRes = &iaas.Server{ - Id: utils.Ptr("sid"), - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + apiClient := newIaaSAPIMock(&iaasMockSettings{ + getServerFails: tt.getFails, + isDeleted: tt.isDeleted, + resourceState: tt.resourceState, + }) + + var wantRes *iaas.Server + if tt.wantResp { + wantRes = &iaas.Server{ + Id: utils.Ptr("sid"), + Status: utils.Ptr(tt.resourceState), + } } - } - handler := DeleteServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") + handler := DeleteServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -735,30 +750,32 @@ func TestResizeServerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newIaaSAPIMock(&iaasMockSettings{ - getServerFails: tt.getFails, - resourceState: tt.finalResourceState, - returnResizing: tt.returnResizing, - }) - - var wantRes *iaas.Server - if tt.wantResp { - wantRes = &iaas.Server{ - Id: utils.Ptr("sid"), - Status: utils.Ptr(tt.finalResourceState), + synctest.Test(t, func(t *testing.T) { + apiClient := newIaaSAPIMock(&iaasMockSettings{ + getServerFails: tt.getFails, + resourceState: tt.finalResourceState, + returnResizing: tt.returnResizing, + }) + + var wantRes *iaas.Server + if tt.wantResp { + wantRes = &iaas.Server{ + Id: utils.Ptr("sid"), + Status: utils.Ptr(tt.finalResourceState), + } } - } - handler := ResizeServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") + handler := ResizeServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") - gotRes, err := handler.SetThrottle(1 * time.Millisecond).SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -802,29 +819,31 @@ func TestStartServerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newIaaSAPIMock(&iaasMockSettings{ - getServerFails: tt.getFails, - resourceState: tt.resourceState, - }) - - var wantRes *iaas.Server - if tt.wantResp { - wantRes = &iaas.Server{ - Id: utils.Ptr("sid"), - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + apiClient := newIaaSAPIMock(&iaasMockSettings{ + getServerFails: tt.getFails, + resourceState: tt.resourceState, + }) + + var wantRes *iaas.Server + if tt.wantResp { + wantRes = &iaas.Server{ + Id: utils.Ptr("sid"), + Status: utils.Ptr(tt.resourceState), + } } - } - handler := StartServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") + handler := StartServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -868,29 +887,31 @@ func TestStopServerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newIaaSAPIMock(&iaasMockSettings{ - getServerFails: tt.getFails, - resourceState: tt.resourceState, - }) - - var wantRes *iaas.Server - if tt.wantResp { - wantRes = &iaas.Server{ - Id: utils.Ptr("sid"), - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + apiClient := newIaaSAPIMock(&iaasMockSettings{ + getServerFails: tt.getFails, + resourceState: tt.resourceState, + }) + + var wantRes *iaas.Server + if tt.wantResp { + wantRes = &iaas.Server{ + Id: utils.Ptr("sid"), + Status: utils.Ptr(tt.resourceState), + } } - } - handler := StopServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") + handler := StopServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -934,29 +955,31 @@ func TestDeallocateServerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newIaaSAPIMock(&iaasMockSettings{ - getServerFails: tt.getFails, - resourceState: tt.resourceState, - }) - - var wantRes *iaas.Server - if tt.wantResp { - wantRes = &iaas.Server{ - Id: utils.Ptr("sid"), - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + apiClient := newIaaSAPIMock(&iaasMockSettings{ + getServerFails: tt.getFails, + resourceState: tt.resourceState, + }) + + var wantRes *iaas.Server + if tt.wantResp { + wantRes = &iaas.Server{ + Id: utils.Ptr("sid"), + Status: utils.Ptr(tt.resourceState), + } } - } - handler := DeallocateServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") + handler := DeallocateServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -1000,29 +1023,31 @@ func TestRescueServerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newIaaSAPIMock(&iaasMockSettings{ - getServerFails: tt.getFails, - resourceState: tt.resourceState, - }) - - var wantRes *iaas.Server - if tt.wantResp { - wantRes = &iaas.Server{ - Id: utils.Ptr("sid"), - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + apiClient := newIaaSAPIMock(&iaasMockSettings{ + getServerFails: tt.getFails, + resourceState: tt.resourceState, + }) + + var wantRes *iaas.Server + if tt.wantResp { + wantRes = &iaas.Server{ + Id: utils.Ptr("sid"), + Status: utils.Ptr(tt.resourceState), + } } - } - handler := RescueServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") + handler := RescueServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -1066,29 +1091,31 @@ func TestUnrescueServerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newIaaSAPIMock(&iaasMockSettings{ - getServerFails: tt.getFails, - resourceState: tt.resourceState, - }) - - var wantRes *iaas.Server - if tt.wantResp { - wantRes = &iaas.Server{ - Id: utils.Ptr("sid"), - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + apiClient := newIaaSAPIMock(&iaasMockSettings{ + getServerFails: tt.getFails, + resourceState: tt.resourceState, + }) + + var wantRes *iaas.Server + if tt.wantResp { + wantRes = &iaas.Server{ + Id: utils.Ptr("sid"), + Status: utils.Ptr(tt.resourceState), + } } - } - handler := UnrescueServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") + handler := UnrescueServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -1159,31 +1186,33 @@ func TestProjectRequestWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newIaaSAPIMock(&iaasMockSettings{ - getProjectRequestFails: tt.getFails, - requestAction: tt.requestAction, - resourceState: tt.requestState, - }) - - var wantRes *iaas.Request - if tt.wantResp { - wantRes = &iaas.Request{ - RequestId: "rid", - RequestAction: tt.requestAction, - Status: tt.requestState, + synctest.Test(t, func(t *testing.T) { + apiClient := newIaaSAPIMock(&iaasMockSettings{ + getProjectRequestFails: tt.getFails, + requestAction: tt.requestAction, + resourceState: tt.requestState, + }) + + var wantRes *iaas.Request + if tt.wantResp { + wantRes = &iaas.Request{ + RequestId: "rid", + RequestAction: tt.requestAction, + Status: tt.requestState, + } } - } - handler := ProjectRequestWaitHandler(context.Background(), apiClient, "pid", "region", "rid") + handler := ProjectRequestWaitHandler(context.Background(), apiClient, "pid", "region", "rid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -1219,29 +1248,31 @@ func TestAddVolumeToServerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newIaaSAPIMock(&iaasMockSettings{ - getAttachedVolumeFails: tt.getFails, - isAttached: tt.isAttached, - }) - - var wantRes *iaas.VolumeAttachment - if tt.wantResp { - wantRes = &iaas.VolumeAttachment{ - ServerId: utils.Ptr("sid"), - VolumeId: utils.Ptr("vid"), + synctest.Test(t, func(t *testing.T) { + apiClient := newIaaSAPIMock(&iaasMockSettings{ + getAttachedVolumeFails: tt.getFails, + isAttached: tt.isAttached, + }) + + var wantRes *iaas.VolumeAttachment + if tt.wantResp { + wantRes = &iaas.VolumeAttachment{ + ServerId: utils.Ptr("sid"), + VolumeId: utils.Ptr("vid"), + } } - } - handler := AddVolumeToServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid", "vid") + handler := AddVolumeToServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid", "vid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -1277,29 +1308,31 @@ func TestRemoveVolumeFromServerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newIaaSAPIMock(&iaasMockSettings{ - getAttachedVolumeFails: tt.getFails, - isAttached: tt.isAttached, - }) - - var wantRes *iaas.VolumeAttachment - if tt.wantResp { - wantRes = &iaas.VolumeAttachment{ - ServerId: utils.Ptr("sid"), - VolumeId: utils.Ptr("vid"), + synctest.Test(t, func(t *testing.T) { + apiClient := newIaaSAPIMock(&iaasMockSettings{ + getAttachedVolumeFails: tt.getFails, + isAttached: tt.isAttached, + }) + + var wantRes *iaas.VolumeAttachment + if tt.wantResp { + wantRes = &iaas.VolumeAttachment{ + ServerId: utils.Ptr("sid"), + VolumeId: utils.Ptr("vid"), + } } - } - handler := RemoveVolumeFromServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid", "vid") + handler := RemoveVolumeFromServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid", "vid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -1343,29 +1376,31 @@ func TestUploadImageWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newIaaSAPIMock(&iaasMockSettings{ - getImageFails: tt.getFails, - resourceState: tt.resourceState, - }) - - var wantRes *iaas.Image - if tt.wantResp { - wantRes = &iaas.Image{ - Id: utils.Ptr("iid"), - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + apiClient := newIaaSAPIMock(&iaasMockSettings{ + getImageFails: tt.getFails, + resourceState: tt.resourceState, + }) + + var wantRes *iaas.Image + if tt.wantResp { + wantRes = &iaas.Image{ + Id: utils.Ptr("iid"), + Status: utils.Ptr(tt.resourceState), + } } - } - handler := UploadImageWaitHandler(context.Background(), apiClient, "pid", "region", "iid") + handler := UploadImageWaitHandler(context.Background(), apiClient, "pid", "region", "iid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -1399,19 +1434,21 @@ func TestDeleteImageWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newIaaSAPIMock(&iaasMockSettings{ - getImageFails: tt.getFails, - isDeleted: tt.isDeleted, - resourceState: tt.resourceState, - }) + synctest.Test(t, func(t *testing.T) { + apiClient := newIaaSAPIMock(&iaasMockSettings{ + getImageFails: tt.getFails, + isDeleted: tt.isDeleted, + resourceState: tt.resourceState, + }) - handler := DeleteImageWaitHandler(context.Background(), apiClient, "pid", "region", "iid") + handler := DeleteImageWaitHandler(context.Background(), apiClient, "pid", "region", "iid") - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } @@ -1455,28 +1492,30 @@ func TestCreateBackupWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newIaaSAPIMock(&iaasMockSettings{ - getBackupFails: tt.getFails, - resourceState: tt.resourceState, - }) - - var wantRes *iaas.Backup - if tt.wantResp { - wantRes = &iaas.Backup{ - Id: utils.Ptr("bid"), - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + apiClient := newIaaSAPIMock(&iaasMockSettings{ + getBackupFails: tt.getFails, + resourceState: tt.resourceState, + }) + + var wantRes *iaas.Backup + if tt.wantResp { + wantRes = &iaas.Backup{ + Id: utils.Ptr("bid"), + Status: utils.Ptr(tt.resourceState), + } } - } - handler := CreateBackupWaitHandler(context.Background(), apiClient, "pid", "region", "bid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + handler := CreateBackupWaitHandler(context.Background(), apiClient, "pid", "region", "bid") + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -1514,21 +1553,23 @@ func TestDeleteBackupWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newIaaSAPIMock(&iaasMockSettings{ - getBackupFails: tt.getFails, - isDeleted: tt.isDeleted, - resourceState: tt.resourceState, + synctest.Test(t, func(t *testing.T) { + apiClient := newIaaSAPIMock(&iaasMockSettings{ + getBackupFails: tt.getFails, + isDeleted: tt.isDeleted, + resourceState: tt.resourceState, + }) + + handler := DeleteBackupWaitHandler(context.Background(), apiClient, "pid", "region", "bid") + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if gotRes != nil { + t.Fatalf("handler gotRes = %v, want nil", gotRes) + } }) - - handler := DeleteBackupWaitHandler(context.Background(), apiClient, "pid", "region", "bid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if gotRes != nil { - t.Fatalf("handler gotRes = %v, want nil", gotRes) - } }) } } @@ -1572,28 +1613,30 @@ func TestRestoreBackupWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newIaaSAPIMock(&iaasMockSettings{ - getBackupFails: tt.getFails, - resourceState: tt.resourceState, - }) - - var wantRes *iaas.Backup - if tt.wantResp { - wantRes = &iaas.Backup{ - Id: utils.Ptr("bid"), - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + apiClient := newIaaSAPIMock(&iaasMockSettings{ + getBackupFails: tt.getFails, + resourceState: tt.resourceState, + }) + + var wantRes *iaas.Backup + if tt.wantResp { + wantRes = &iaas.Backup{ + Id: utils.Ptr("bid"), + Status: utils.Ptr(tt.resourceState), + } } - } - handler := RestoreBackupWaitHandler(context.Background(), apiClient, "pid", "region", "bid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + handler := RestoreBackupWaitHandler(context.Background(), apiClient, "pid", "region", "bid") + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -1637,28 +1680,30 @@ func TestCreateSnapshotWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newIaaSAPIMock(&iaasMockSettings{ - getSnapshotFails: tt.getFails, - resourceState: tt.resourceState, - }) - - var wantRes *iaas.Snapshot - if tt.wantResp { - wantRes = &iaas.Snapshot{ - Id: utils.Ptr("sid"), - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + apiClient := newIaaSAPIMock(&iaasMockSettings{ + getSnapshotFails: tt.getFails, + resourceState: tt.resourceState, + }) + + var wantRes *iaas.Snapshot + if tt.wantResp { + wantRes = &iaas.Snapshot{ + Id: utils.Ptr("sid"), + Status: utils.Ptr(tt.resourceState), + } } - } - handler := CreateSnapshotWaitHandler(context.Background(), apiClient, "pid", "region", "sid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + handler := CreateSnapshotWaitHandler(context.Background(), apiClient, "pid", "region", "sid") + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -1702,28 +1747,30 @@ func TestDeleteSnapshotWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newIaaSAPIMock(&iaasMockSettings{ - getSnapshotFails: tt.getFails, - resourceState: tt.resourceState, - }) - - var wantRes *iaas.Snapshot - if tt.wantResp { - wantRes = &iaas.Snapshot{ - Id: utils.Ptr("sid"), - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + apiClient := newIaaSAPIMock(&iaasMockSettings{ + getSnapshotFails: tt.getFails, + resourceState: tt.resourceState, + }) + + var wantRes *iaas.Snapshot + if tt.wantResp { + wantRes = &iaas.Snapshot{ + Id: utils.Ptr("sid"), + Status: utils.Ptr(tt.resourceState), + } } - } - handler := DeleteSnapshotWaitHandler(context.Background(), apiClient, "pid", "region", "sid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + handler := DeleteSnapshotWaitHandler(context.Background(), apiClient, "pid", "region", "sid") + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -1851,28 +1898,30 @@ func TestReadyForNetworkAreaDeletionWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newIaaSAPIMock(&iaasMockSettings{ - listProjectsResponses: tt.listProjectsResponses, - }) - - rmApiClient := newResourcemanagerAPIMock(&resourcemanagerMockSettings{ - getProjectResponses: tt.getProjectResponses, - }) - - var wantRes *iaas.ProjectListResponse - if tt.wantResp { - wantRes = tt.listProjectsResponses[len(tt.listProjectsResponses)-1].resp - } + synctest.Test(t, func(t *testing.T) { + apiClient := newIaaSAPIMock(&iaasMockSettings{ + listProjectsResponses: tt.listProjectsResponses, + }) + + rmApiClient := newResourcemanagerAPIMock(&resourcemanagerMockSettings{ + getProjectResponses: tt.getProjectResponses, + }) + + var wantRes *iaas.ProjectListResponse + if tt.wantResp { + wantRes = tt.listProjectsResponses[len(tt.listProjectsResponses)-1].resp + } - handler := ReadyForNetworkAreaDeletionWaitHandler(context.Background(), apiClient, rmApiClient, "oid", "aid") - gotRes, err := handler.SetTimeout(200 * time.Millisecond).SetThrottle(5 * time.Millisecond).WaitWithContext(context.Background()) + handler := ReadyForNetworkAreaDeletionWaitHandler(context.Background(), apiClient, rmApiClient, "oid", "aid") + gotRes, err := handler.WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -1909,28 +1958,30 @@ func TestCreateNetworkAreaRegionWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newIaaSAPIMock(&iaasMockSettings{ - getNetworkAreaRegionFails: tt.getFails, - resourceState: tt.resourceState, - }) - - var wantRes *iaas.RegionalArea - if tt.wantResp { - wantRes = &iaas.RegionalArea{ - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + apiClient := newIaaSAPIMock(&iaasMockSettings{ + getNetworkAreaRegionFails: tt.getFails, + resourceState: tt.resourceState, + }) + + var wantRes *iaas.RegionalArea + if tt.wantResp { + wantRes = &iaas.RegionalArea{ + Status: utils.Ptr(tt.resourceState), + } } - } - handler := CreateNetworkAreaRegionWaitHandler(context.Background(), apiClient, "pid", "aid", "region") + handler := CreateNetworkAreaRegionWaitHandler(context.Background(), apiClient, "pid", "aid", "region") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -1968,29 +2019,31 @@ func TestDeleteNetworkAreaRegionWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newIaaSAPIMock(&iaasMockSettings{ - getNetworkAreaRegionFails: tt.getFails, - isDeleted: tt.isDeleted, - resourceState: tt.resourceState, - }) - - var wantRes *iaas.RegionalArea - if tt.wantResp { - wantRes = &iaas.RegionalArea{ - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + apiClient := newIaaSAPIMock(&iaasMockSettings{ + getNetworkAreaRegionFails: tt.getFails, + isDeleted: tt.isDeleted, + resourceState: tt.resourceState, + }) + + var wantRes *iaas.RegionalArea + if tt.wantResp { + wantRes = &iaas.RegionalArea{ + Status: utils.Ptr(tt.resourceState), + } } - } - handler := DeleteNetworkAreaRegionWaitHandler(context.Background(), apiClient, "pid", "region", "nid") + handler := DeleteNetworkAreaRegionWaitHandler(context.Background(), apiClient, "pid", "region", "nid") - gotRes, err := handler.SetSleepBeforeWait(0).SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetSleepBeforeWait(0).SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } diff --git a/services/iaas/wait/wait_test.go b/services/iaas/wait/wait_test.go index 90f0a7332..60a71eb81 100644 --- a/services/iaas/wait/wait_test.go +++ b/services/iaas/wait/wait_test.go @@ -4,6 +4,7 @@ import ( "context" "net/http" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -286,29 +287,31 @@ func TestCreateNetworkWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getNetworkFails: tt.getFails, - resourceState: tt.resourceState, - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getNetworkFails: tt.getFails, + resourceState: tt.resourceState, + } - var wantRes *iaas.Network - if tt.wantResp { - wantRes = &iaas.Network{ - Id: utils.Ptr("nid"), - Status: utils.Ptr(tt.resourceState), + var wantRes *iaas.Network + if tt.wantResp { + wantRes = &iaas.Network{ + Id: utils.Ptr("nid"), + Status: utils.Ptr(tt.resourceState), + } } - } - handler := CreateNetworkWaitHandler(context.Background(), apiClient, "pid", "region", "nid") + handler := CreateNetworkWaitHandler(context.Background(), apiClient, "pid", "region", "nid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -345,29 +348,31 @@ func TestUpdateNetworkWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getNetworkFails: tt.getFails, - resourceState: tt.resourceState, - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getNetworkFails: tt.getFails, + resourceState: tt.resourceState, + } - var wantRes *iaas.Network - if tt.wantResp { - wantRes = &iaas.Network{ - Id: utils.Ptr("nid"), - Status: utils.Ptr(tt.resourceState), + var wantRes *iaas.Network + if tt.wantResp { + wantRes = &iaas.Network{ + Id: utils.Ptr("nid"), + Status: utils.Ptr(tt.resourceState), + } } - } - handler := UpdateNetworkWaitHandler(context.Background(), apiClient, "pid", "region", "nid") + handler := UpdateNetworkWaitHandler(context.Background(), apiClient, "pid", "region", "nid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -405,30 +410,32 @@ func TestDeleteNetworkWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getNetworkFails: tt.getFails, - isDeleted: tt.isDeleted, - resourceState: tt.resourceState, - } - - var wantRes *iaas.Network - if tt.wantResp { - wantRes = &iaas.Network{ - Id: utils.Ptr("nid"), - Status: utils.Ptr(tt.resourceState), - } - } - - handler := DeleteNetworkWaitHandler(context.Background(), apiClient, "pid", "region", "nid") - - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getNetworkFails: tt.getFails, + isDeleted: tt.isDeleted, + resourceState: tt.resourceState, + } + + var wantRes *iaas.Network + if tt.wantResp { + wantRes = &iaas.Network{ + Id: utils.Ptr("nid"), + Status: utils.Ptr(tt.resourceState), + } + } + + handler := DeleteNetworkWaitHandler(context.Background(), apiClient, "pid", "region", "nid") + + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -472,29 +479,31 @@ func TestCreateVolumeWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getVolumeFails: tt.getFails, - resourceState: tt.resourceState, - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getVolumeFails: tt.getFails, + resourceState: tt.resourceState, + } - var wantRes *iaas.Volume - if tt.wantResp { - wantRes = &iaas.Volume{ - Id: utils.Ptr("vid"), - Status: utils.Ptr(tt.resourceState), + var wantRes *iaas.Volume + if tt.wantResp { + wantRes = &iaas.Volume{ + Id: utils.Ptr("vid"), + Status: utils.Ptr(tt.resourceState), + } } - } - handler := CreateVolumeWaitHandler(context.Background(), apiClient, "pid", "region", "vid") + handler := CreateVolumeWaitHandler(context.Background(), apiClient, "pid", "region", "vid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -532,30 +541,32 @@ func TestDeleteVolumeWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getVolumeFails: tt.getFails, - isDeleted: tt.isDeleted, - resourceState: tt.resourceState, - } - - var wantRes *iaas.Volume - if tt.wantResp { - wantRes = &iaas.Volume{ - Id: utils.Ptr("vid"), - Status: utils.Ptr(tt.resourceState), - } - } - - handler := DeleteVolumeWaitHandler(context.Background(), apiClient, "pid", "region", "vid") - - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getVolumeFails: tt.getFails, + isDeleted: tt.isDeleted, + resourceState: tt.resourceState, + } + + var wantRes *iaas.Volume + if tt.wantResp { + wantRes = &iaas.Volume{ + Id: utils.Ptr("vid"), + Status: utils.Ptr(tt.resourceState), + } + } + + handler := DeleteVolumeWaitHandler(context.Background(), apiClient, "pid", "region", "vid") + + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -599,29 +610,31 @@ func TestCreateServerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getServerFails: tt.getFails, - resourceState: tt.resourceState, - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getServerFails: tt.getFails, + resourceState: tt.resourceState, + } - var wantRes *iaas.Server - if tt.wantResp { - wantRes = &iaas.Server{ - Id: utils.Ptr("sid"), - Status: utils.Ptr(tt.resourceState), + var wantRes *iaas.Server + if tt.wantResp { + wantRes = &iaas.Server{ + Id: utils.Ptr("sid"), + Status: utils.Ptr(tt.resourceState), + } } - } - handler := CreateServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") + handler := CreateServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -659,30 +672,32 @@ func TestDeleteServerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getServerFails: tt.getFails, - isDeleted: tt.isDeleted, - resourceState: tt.resourceState, - } - - var wantRes *iaas.Server - if tt.wantResp { - wantRes = &iaas.Server{ - Id: utils.Ptr("sid"), - Status: utils.Ptr(tt.resourceState), - } - } - - handler := DeleteServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") - - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getServerFails: tt.getFails, + isDeleted: tt.isDeleted, + resourceState: tt.resourceState, + } + + var wantRes *iaas.Server + if tt.wantResp { + wantRes = &iaas.Server{ + Id: utils.Ptr("sid"), + Status: utils.Ptr(tt.resourceState), + } + } + + handler := DeleteServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") + + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -737,30 +752,32 @@ func TestResizeServerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getServerFails: tt.getFails, - resourceState: tt.finalResourceState, - returnResizing: tt.returnResizing, - } - - var wantRes *iaas.Server - if tt.wantResp { - wantRes = &iaas.Server{ - Id: utils.Ptr("sid"), - Status: utils.Ptr(tt.finalResourceState), - } - } - - handler := ResizeServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") - - gotRes, err := handler.SetThrottle(1 * time.Millisecond).SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getServerFails: tt.getFails, + resourceState: tt.finalResourceState, + returnResizing: tt.returnResizing, + } + + var wantRes *iaas.Server + if tt.wantResp { + wantRes = &iaas.Server{ + Id: utils.Ptr("sid"), + Status: utils.Ptr(tt.finalResourceState), + } + } + + handler := ResizeServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") + + gotRes, err := handler.WaitWithContext(context.Background()) + + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -804,29 +821,31 @@ func TestStartServerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getServerFails: tt.getFails, - resourceState: tt.resourceState, - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getServerFails: tt.getFails, + resourceState: tt.resourceState, + } - var wantRes *iaas.Server - if tt.wantResp { - wantRes = &iaas.Server{ - Id: utils.Ptr("sid"), - Status: utils.Ptr(tt.resourceState), + var wantRes *iaas.Server + if tt.wantResp { + wantRes = &iaas.Server{ + Id: utils.Ptr("sid"), + Status: utils.Ptr(tt.resourceState), + } } - } - handler := StartServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") + handler := StartServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -870,29 +889,31 @@ func TestStopServerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getServerFails: tt.getFails, - resourceState: tt.resourceState, - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getServerFails: tt.getFails, + resourceState: tt.resourceState, + } - var wantRes *iaas.Server - if tt.wantResp { - wantRes = &iaas.Server{ - Id: utils.Ptr("sid"), - Status: utils.Ptr(tt.resourceState), + var wantRes *iaas.Server + if tt.wantResp { + wantRes = &iaas.Server{ + Id: utils.Ptr("sid"), + Status: utils.Ptr(tt.resourceState), + } } - } - handler := StopServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") + handler := StopServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -936,29 +957,31 @@ func TestDeallocateServerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getServerFails: tt.getFails, - resourceState: tt.resourceState, - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getServerFails: tt.getFails, + resourceState: tt.resourceState, + } - var wantRes *iaas.Server - if tt.wantResp { - wantRes = &iaas.Server{ - Id: utils.Ptr("sid"), - Status: utils.Ptr(tt.resourceState), + var wantRes *iaas.Server + if tt.wantResp { + wantRes = &iaas.Server{ + Id: utils.Ptr("sid"), + Status: utils.Ptr(tt.resourceState), + } } - } - handler := DeallocateServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") + handler := DeallocateServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -1002,29 +1025,31 @@ func TestRescueServerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getServerFails: tt.getFails, - resourceState: tt.resourceState, - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getServerFails: tt.getFails, + resourceState: tt.resourceState, + } - var wantRes *iaas.Server - if tt.wantResp { - wantRes = &iaas.Server{ - Id: utils.Ptr("sid"), - Status: utils.Ptr(tt.resourceState), + var wantRes *iaas.Server + if tt.wantResp { + wantRes = &iaas.Server{ + Id: utils.Ptr("sid"), + Status: utils.Ptr(tt.resourceState), + } } - } - handler := RescueServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") + handler := RescueServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -1068,29 +1093,31 @@ func TestUnrescueServerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getServerFails: tt.getFails, - resourceState: tt.resourceState, - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getServerFails: tt.getFails, + resourceState: tt.resourceState, + } - var wantRes *iaas.Server - if tt.wantResp { - wantRes = &iaas.Server{ - Id: utils.Ptr("sid"), - Status: utils.Ptr(tt.resourceState), + var wantRes *iaas.Server + if tt.wantResp { + wantRes = &iaas.Server{ + Id: utils.Ptr("sid"), + Status: utils.Ptr(tt.resourceState), + } } - } - handler := UnrescueServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") + handler := UnrescueServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -1161,31 +1188,33 @@ func TestProjectRequestWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getProjectRequestFails: tt.getFails, - requestAction: tt.requestAction, - resourceState: tt.requestState, - } - - var wantRes *iaas.Request - if tt.wantResp { - wantRes = &iaas.Request{ - RequestId: utils.Ptr("rid"), - RequestAction: utils.Ptr(tt.requestAction), - Status: utils.Ptr(tt.requestState), - } - } - - handler := ProjectRequestWaitHandler(context.Background(), apiClient, "pid", "region", "rid") - - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getProjectRequestFails: tt.getFails, + requestAction: tt.requestAction, + resourceState: tt.requestState, + } + + var wantRes *iaas.Request + if tt.wantResp { + wantRes = &iaas.Request{ + RequestId: utils.Ptr("rid"), + RequestAction: utils.Ptr(tt.requestAction), + Status: utils.Ptr(tt.requestState), + } + } + + handler := ProjectRequestWaitHandler(context.Background(), apiClient, "pid", "region", "rid") + + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -1221,29 +1250,31 @@ func TestAddVolumeToServerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getAttachedVolumeFails: tt.getFails, - isAttached: tt.isAttached, - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getAttachedVolumeFails: tt.getFails, + isAttached: tt.isAttached, + } - var wantRes *iaas.VolumeAttachment - if tt.wantResp { - wantRes = &iaas.VolumeAttachment{ - ServerId: utils.Ptr("sid"), - VolumeId: utils.Ptr("vid"), + var wantRes *iaas.VolumeAttachment + if tt.wantResp { + wantRes = &iaas.VolumeAttachment{ + ServerId: utils.Ptr("sid"), + VolumeId: utils.Ptr("vid"), + } } - } - handler := AddVolumeToServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid", "vid") + handler := AddVolumeToServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid", "vid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -1279,29 +1310,31 @@ func TestRemoveVolumeFromServerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getAttachedVolumeFails: tt.getFails, - isAttached: tt.isAttached, - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getAttachedVolumeFails: tt.getFails, + isAttached: tt.isAttached, + } - var wantRes *iaas.VolumeAttachment - if tt.wantResp { - wantRes = &iaas.VolumeAttachment{ - ServerId: utils.Ptr("sid"), - VolumeId: utils.Ptr("vid"), + var wantRes *iaas.VolumeAttachment + if tt.wantResp { + wantRes = &iaas.VolumeAttachment{ + ServerId: utils.Ptr("sid"), + VolumeId: utils.Ptr("vid"), + } } - } - handler := RemoveVolumeFromServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid", "vid") + handler := RemoveVolumeFromServerWaitHandler(context.Background(), apiClient, "pid", "region", "sid", "vid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -1345,29 +1378,31 @@ func TestUploadImageWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getImageFails: tt.getFails, - resourceState: tt.resourceState, - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getImageFails: tt.getFails, + resourceState: tt.resourceState, + } - var wantRes *iaas.Image - if tt.wantResp { - wantRes = &iaas.Image{ - Id: utils.Ptr("iid"), - Status: utils.Ptr(tt.resourceState), + var wantRes *iaas.Image + if tt.wantResp { + wantRes = &iaas.Image{ + Id: utils.Ptr("iid"), + Status: utils.Ptr(tt.resourceState), + } } - } - handler := UploadImageWaitHandler(context.Background(), apiClient, "pid", "region", "iid") + handler := UploadImageWaitHandler(context.Background(), apiClient, "pid", "region", "iid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -1401,19 +1436,21 @@ func TestDeleteImageWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getImageFails: tt.getFails, - isDeleted: tt.isDeleted, - resourceState: tt.resourceState, - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getImageFails: tt.getFails, + isDeleted: tt.isDeleted, + resourceState: tt.resourceState, + } - handler := DeleteImageWaitHandler(context.Background(), apiClient, "pid", "region", "iid") + handler := DeleteImageWaitHandler(context.Background(), apiClient, "pid", "region", "iid") - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } @@ -1457,28 +1494,30 @@ func TestCreateBackupWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getBackupFails: tt.getFails, - resourceState: tt.resourceState, - } - - var wantRes *iaas.Backup - if tt.wantResp { - wantRes = &iaas.Backup{ - Id: utils.Ptr("bid"), - Status: utils.Ptr(tt.resourceState), - } - } - - handler := CreateBackupWaitHandler(context.Background(), apiClient, "pid", "region", "bid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getBackupFails: tt.getFails, + resourceState: tt.resourceState, + } + + var wantRes *iaas.Backup + if tt.wantResp { + wantRes = &iaas.Backup{ + Id: utils.Ptr("bid"), + Status: utils.Ptr(tt.resourceState), + } + } + + handler := CreateBackupWaitHandler(context.Background(), apiClient, "pid", "region", "bid") + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -1516,21 +1555,23 @@ func TestDeleteBackupWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getBackupFails: tt.getFails, - isDeleted: tt.isDeleted, - resourceState: tt.resourceState, - } - - handler := DeleteBackupWaitHandler(context.Background(), apiClient, "pid", "region", "bid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if gotRes != nil { - t.Fatalf("handler gotRes = %v, want nil", gotRes) - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getBackupFails: tt.getFails, + isDeleted: tt.isDeleted, + resourceState: tt.resourceState, + } + + handler := DeleteBackupWaitHandler(context.Background(), apiClient, "pid", "region", "bid") + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if gotRes != nil { + t.Fatalf("handler gotRes = %v, want nil", gotRes) + } + }) }) } } @@ -1574,28 +1615,30 @@ func TestRestoreBackupWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getBackupFails: tt.getFails, - resourceState: tt.resourceState, - } - - var wantRes *iaas.Backup - if tt.wantResp { - wantRes = &iaas.Backup{ - Id: utils.Ptr("bid"), - Status: utils.Ptr(tt.resourceState), - } - } - - handler := RestoreBackupWaitHandler(context.Background(), apiClient, "pid", "region", "bid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getBackupFails: tt.getFails, + resourceState: tt.resourceState, + } + + var wantRes *iaas.Backup + if tt.wantResp { + wantRes = &iaas.Backup{ + Id: utils.Ptr("bid"), + Status: utils.Ptr(tt.resourceState), + } + } + + handler := RestoreBackupWaitHandler(context.Background(), apiClient, "pid", "region", "bid") + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -1639,28 +1682,30 @@ func TestCreateSnapshotWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getSnapshotFails: tt.getFails, - resourceState: tt.resourceState, - } - - var wantRes *iaas.Snapshot - if tt.wantResp { - wantRes = &iaas.Snapshot{ - Id: utils.Ptr("sid"), - Status: utils.Ptr(tt.resourceState), - } - } - - handler := CreateSnapshotWaitHandler(context.Background(), apiClient, "pid", "region", "sid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getSnapshotFails: tt.getFails, + resourceState: tt.resourceState, + } + + var wantRes *iaas.Snapshot + if tt.wantResp { + wantRes = &iaas.Snapshot{ + Id: utils.Ptr("sid"), + Status: utils.Ptr(tt.resourceState), + } + } + + handler := CreateSnapshotWaitHandler(context.Background(), apiClient, "pid", "region", "sid") + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -1704,28 +1749,30 @@ func TestDeleteSnapshotWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getSnapshotFails: tt.getFails, - resourceState: tt.resourceState, - } - - var wantRes *iaas.Snapshot - if tt.wantResp { - wantRes = &iaas.Snapshot{ - Id: utils.Ptr("sid"), - Status: utils.Ptr(tt.resourceState), - } - } - - handler := DeleteSnapshotWaitHandler(context.Background(), apiClient, "pid", "region", "sid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getSnapshotFails: tt.getFails, + resourceState: tt.resourceState, + } + + var wantRes *iaas.Snapshot + if tt.wantResp { + wantRes = &iaas.Snapshot{ + Id: utils.Ptr("sid"), + Status: utils.Ptr(tt.resourceState), + } + } + + handler := DeleteSnapshotWaitHandler(context.Background(), apiClient, "pid", "region", "sid") + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -1853,28 +1900,30 @@ func TestReadyForNetworkAreaDeletionWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - listProjectsResponses: tt.listProjectsResponses, - } - - rmApiClient := &resourceManagerClientMocked{ - getProjectResponses: tt.getProjectResponses, - } - - var wantRes *iaas.ProjectListResponse - if tt.wantResp { - wantRes = tt.listProjectsResponses[len(tt.listProjectsResponses)-1].resp - } - - handler := ReadyForNetworkAreaDeletionWaitHandler(context.Background(), apiClient, rmApiClient, "oid", "aid") - gotRes, err := handler.SetTimeout(200 * time.Millisecond).SetThrottle(5 * time.Millisecond).WaitWithContext(context.Background()) - - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + listProjectsResponses: tt.listProjectsResponses, + } + + rmApiClient := &resourceManagerClientMocked{ + getProjectResponses: tt.getProjectResponses, + } + + var wantRes *iaas.ProjectListResponse + if tt.wantResp { + wantRes = tt.listProjectsResponses[len(tt.listProjectsResponses)-1].resp + } + + handler := ReadyForNetworkAreaDeletionWaitHandler(context.Background(), apiClient, rmApiClient, "oid", "aid") + gotRes, err := handler.WaitWithContext(context.Background()) + + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -1911,28 +1960,30 @@ func TestCreateNetworkAreaRegionWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getNetworkAreaRegionFails: tt.getFails, - resourceState: tt.resourceState, - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getNetworkAreaRegionFails: tt.getFails, + resourceState: tt.resourceState, + } - var wantRes *iaas.RegionalArea - if tt.wantResp { - wantRes = &iaas.RegionalArea{ - Status: utils.Ptr(tt.resourceState), + var wantRes *iaas.RegionalArea + if tt.wantResp { + wantRes = &iaas.RegionalArea{ + Status: utils.Ptr(tt.resourceState), + } } - } - handler := CreateNetworkAreaRegionWaitHandler(context.Background(), apiClient, "pid", "aid", "region") + handler := CreateNetworkAreaRegionWaitHandler(context.Background(), apiClient, "pid", "aid", "region") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -1970,29 +2021,31 @@ func TestDeleteNetworkAreaRegionWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getNetworkAreaRegionFails: tt.getFails, - isDeleted: tt.isDeleted, - resourceState: tt.resourceState, - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getNetworkAreaRegionFails: tt.getFails, + isDeleted: tt.isDeleted, + resourceState: tt.resourceState, + } - var wantRes *iaas.RegionalArea - if tt.wantResp { - wantRes = &iaas.RegionalArea{ - Status: utils.Ptr(tt.resourceState), + var wantRes *iaas.RegionalArea + if tt.wantResp { + wantRes = &iaas.RegionalArea{ + Status: utils.Ptr(tt.resourceState), + } } - } - handler := DeleteNetworkAreaRegionWaitHandler(context.Background(), apiClient, "pid", "region", "nid") + handler := DeleteNetworkAreaRegionWaitHandler(context.Background(), apiClient, "pid", "region", "nid") - gotRes, err := handler.SetSleepBeforeWait(0).SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetSleepBeforeWait(0).SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } diff --git a/services/iaasalpha/wait/wait_test.go b/services/iaasalpha/wait/wait_test.go index 71f0dcfda..89f95b8b0 100644 --- a/services/iaasalpha/wait/wait_test.go +++ b/services/iaasalpha/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -69,29 +70,31 @@ func TestCreateNetworkWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getNetworkFails: tt.getFails, - resourceState: tt.resourceState, - } - - var wantRes *iaasalpha.Network - if tt.wantResp { - wantRes = &iaasalpha.Network{ - Id: utils.Ptr("nid"), - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getNetworkFails: tt.getFails, + resourceState: tt.resourceState, } - } - handler := CreateNetworkWaitHandler(context.Background(), apiClient, "pid", "eu01", "nid") + var wantRes *iaasalpha.Network + if tt.wantResp { + wantRes = &iaasalpha.Network{ + Id: utils.Ptr("nid"), + Status: utils.Ptr(tt.resourceState), + } + } + + handler := CreateNetworkWaitHandler(context.Background(), apiClient, "pid", "eu01", "nid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -128,29 +131,31 @@ func TestUpdateNetworkWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getNetworkFails: tt.getFails, - resourceState: tt.resourceState, - } - - var wantRes *iaasalpha.Network - if tt.wantResp { - wantRes = &iaasalpha.Network{ - Id: utils.Ptr("nid"), - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getNetworkFails: tt.getFails, + resourceState: tt.resourceState, + } + + var wantRes *iaasalpha.Network + if tt.wantResp { + wantRes = &iaasalpha.Network{ + Id: utils.Ptr("nid"), + Status: utils.Ptr(tt.resourceState), + } } - } - handler := UpdateNetworkWaitHandler(context.Background(), apiClient, "pid", "eu01", "nid") + handler := UpdateNetworkWaitHandler(context.Background(), apiClient, "pid", "eu01", "nid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -188,30 +193,32 @@ func TestDeleteNetworkWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getNetworkFails: tt.getFails, - isDeleted: tt.isDeleted, - resourceState: tt.resourceState, - } - - var wantRes *iaasalpha.Network - if tt.wantResp { - wantRes = &iaasalpha.Network{ - Id: utils.Ptr("nid"), - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getNetworkFails: tt.getFails, + isDeleted: tt.isDeleted, + resourceState: tt.resourceState, + } + + var wantRes *iaasalpha.Network + if tt.wantResp { + wantRes = &iaasalpha.Network{ + Id: utils.Ptr("nid"), + Status: utils.Ptr(tt.resourceState), + } } - } - handler := DeleteNetworkWaitHandler(context.Background(), apiClient, "pid", "eu01", "nid") + handler := DeleteNetworkWaitHandler(context.Background(), apiClient, "pid", "eu01", "nid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } diff --git a/services/intake/v1betaapi/wait/wait_test.go b/services/intake/v1betaapi/wait/wait_test.go index 4ca074652..3c15a551e 100644 --- a/services/intake/v1betaapi/wait/wait_test.go +++ b/services/intake/v1betaapi/wait/wait_test.go @@ -4,6 +4,7 @@ import ( "context" "net/http" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -144,27 +145,29 @@ func TestCreateOrUpdateIntakeRunnerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newAPIMock(&mockSettings{ - getRunnerFails: tt.getFails, - getErrorCode: tt.getErrorCode, - returnRunner: tt.returnRunner, - intakeRunnerResponse: tt.intakeRunnerResponse, - }) + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(&mockSettings{ + getRunnerFails: tt.getFails, + getErrorCode: tt.getErrorCode, + returnRunner: tt.returnRunner, + intakeRunnerResponse: tt.intakeRunnerResponse, + }) - var wantResp *intake.IntakeRunnerResponse - if tt.wantResp { - wantResp = tt.intakeRunnerResponse - } + var wantResp *intake.IntakeRunnerResponse + if tt.wantResp { + wantResp = tt.intakeRunnerResponse + } - handler := CreateOrUpdateIntakeRunnerWaitHandler(context.Background(), apiClient, projectId, region, intakeRunnerId) - got, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + handler := CreateOrUpdateIntakeRunnerWaitHandler(context.Background(), apiClient, projectId, region, intakeRunnerId) + got, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(got, wantResp) { - t.Fatalf("handler got = %v, want %v", got, wantResp) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(got, wantResp) { + t.Fatalf("handler got = %v, want %v", got, wantResp) + } + }) }) } } @@ -200,21 +203,23 @@ func TestDeleteIntakeRunnerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newAPIMock(&mockSettings{ - getRunnerFails: tt.getFails, - getErrorCode: tt.getErrorCode, - returnRunner: tt.returnRunner, - intakeRunnerResponse: &intake.IntakeRunnerResponse{ // This is only used in the timeout case - Id: intakeRunnerId, - }, - }) + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(&mockSettings{ + getRunnerFails: tt.getFails, + getErrorCode: tt.getErrorCode, + returnRunner: tt.returnRunner, + intakeRunnerResponse: &intake.IntakeRunnerResponse{ // This is only used in the timeout case + Id: intakeRunnerId, + }, + }) - handler := DeleteIntakeRunnerWaitHandler(context.Background(), apiClient, projectId, region, intakeRunnerId) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + handler := DeleteIntakeRunnerWaitHandler(context.Background(), apiClient, projectId, region, intakeRunnerId) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } @@ -300,27 +305,29 @@ func TestCreateOrUpdateIntakeWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newAPIMock(&mockSettings{ - getIntakeFails: tt.getFails, - getErrorCode: tt.getErrorCode, - returnIntake: tt.returnIntake, - intakeResponse: tt.intakeResponse, - }) + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(&mockSettings{ + getIntakeFails: tt.getFails, + getErrorCode: tt.getErrorCode, + returnIntake: tt.returnIntake, + intakeResponse: tt.intakeResponse, + }) - var wantResp *intake.IntakeResponse - if tt.wantResp { - wantResp = tt.intakeResponse - } + var wantResp *intake.IntakeResponse + if tt.wantResp { + wantResp = tt.intakeResponse + } - handler := CreateOrUpdateIntakeWaitHandler(context.Background(), apiClient, projectId, region, intakeId) - got, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + handler := CreateOrUpdateIntakeWaitHandler(context.Background(), apiClient, projectId, region, intakeId) + got, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(got, wantResp) { - t.Fatalf("handler got = %v, want %v", got, wantResp) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(got, wantResp) { + t.Fatalf("handler got = %v, want %v", got, wantResp) + } + }) }) } } @@ -356,21 +363,23 @@ func TestDeleteIntakeWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newAPIMock(&mockSettings{ - getIntakeFails: tt.getFails, - getErrorCode: tt.getErrorCode, - returnIntake: tt.returnIntake, - intakeResponse: &intake.IntakeResponse{ - Id: intakeId, - }, - }) + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(&mockSettings{ + getIntakeFails: tt.getFails, + getErrorCode: tt.getErrorCode, + returnIntake: tt.returnIntake, + intakeResponse: &intake.IntakeResponse{ + Id: intakeId, + }, + }) - handler := DeleteIntakeWaitHandler(context.Background(), apiClient, projectId, region, intakeId) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + handler := DeleteIntakeWaitHandler(context.Background(), apiClient, projectId, region, intakeId) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } @@ -445,27 +454,29 @@ func TestCreateOrUpdateIntakeUserWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newAPIMock(&mockSettings{ - getUserFails: tt.getFails, - getErrorCode: tt.getErrorCode, - returnUser: tt.returnUser, - intakeUserResponse: tt.intakeUserResponse, - }) + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(&mockSettings{ + getUserFails: tt.getFails, + getErrorCode: tt.getErrorCode, + returnUser: tt.returnUser, + intakeUserResponse: tt.intakeUserResponse, + }) - var wantResp *intake.IntakeUserResponse - if tt.wantResp { - wantResp = tt.intakeUserResponse - } + var wantResp *intake.IntakeUserResponse + if tt.wantResp { + wantResp = tt.intakeUserResponse + } - handler := CreateOrUpdateIntakeUserWaitHandler(context.Background(), apiClient, projectId, region, intakeId, intakeUserId) - got, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + handler := CreateOrUpdateIntakeUserWaitHandler(context.Background(), apiClient, projectId, region, intakeId, intakeUserId) + got, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(got, wantResp) { - t.Fatalf("handler got = %v, want %v", got, wantResp) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(got, wantResp) { + t.Fatalf("handler got = %v, want %v", got, wantResp) + } + }) }) } } @@ -501,21 +512,23 @@ func TestDeleteIntakeUserWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newAPIMock(&mockSettings{ - getUserFails: tt.getFails, - getErrorCode: tt.getErrorCode, - returnUser: tt.returnUser, - intakeUserResponse: &intake.IntakeUserResponse{ - Id: intakeUserId, - }, - }) + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(&mockSettings{ + getUserFails: tt.getFails, + getErrorCode: tt.getErrorCode, + returnUser: tt.returnUser, + intakeUserResponse: &intake.IntakeUserResponse{ + Id: intakeUserId, + }, + }) - handler := DeleteIntakeUserWaitHandler(context.Background(), apiClient, projectId, region, intakeId, intakeUserId) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + handler := DeleteIntakeUserWaitHandler(context.Background(), apiClient, projectId, region, intakeId, intakeUserId) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } diff --git a/services/intake/wait/wait_test.go b/services/intake/wait/wait_test.go index a0cdc0b08..9af6e20ec 100644 --- a/services/intake/wait/wait_test.go +++ b/services/intake/wait/wait_test.go @@ -4,6 +4,7 @@ import ( "context" "net/http" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -143,27 +144,29 @@ func TestCreateOrUpdateIntakeRunnerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getRunnerFails: tt.getFails, - getErrorCode: tt.getErrorCode, - returnRunner: tt.returnRunner, - intakeRunnerResponse: tt.intakeRunnerResponse, - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getRunnerFails: tt.getFails, + getErrorCode: tt.getErrorCode, + returnRunner: tt.returnRunner, + intakeRunnerResponse: tt.intakeRunnerResponse, + } - var wantResp *intake.IntakeRunnerResponse - if tt.wantResp { - wantResp = tt.intakeRunnerResponse - } + var wantResp *intake.IntakeRunnerResponse + if tt.wantResp { + wantResp = tt.intakeRunnerResponse + } - handler := CreateOrUpdateIntakeRunnerWaitHandler(context.Background(), apiClient, projectId, region, intakeRunnerId) - got, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + handler := CreateOrUpdateIntakeRunnerWaitHandler(context.Background(), apiClient, projectId, region, intakeRunnerId) + got, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(got, wantResp) { - t.Fatalf("handler got = %v, want %v", got, wantResp) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(got, wantResp) { + t.Fatalf("handler got = %v, want %v", got, wantResp) + } + }) }) } } @@ -199,20 +202,22 @@ func TestDeleteIntakeRunnerWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getRunnerFails: tt.getFails, - getErrorCode: tt.getErrorCode, - returnRunner: tt.returnRunner, - intakeRunnerResponse: &intake.IntakeRunnerResponse{ // This is only used in the timeout case - Id: utils.Ptr(intakeRunnerId), - }, - } - handler := DeleteIntakeRunnerWaitHandler(context.Background(), apiClient, projectId, region, intakeRunnerId) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getRunnerFails: tt.getFails, + getErrorCode: tt.getErrorCode, + returnRunner: tt.returnRunner, + intakeRunnerResponse: &intake.IntakeRunnerResponse{ // This is only used in the timeout case + Id: utils.Ptr(intakeRunnerId), + }, + } + handler := DeleteIntakeRunnerWaitHandler(context.Background(), apiClient, projectId, region, intakeRunnerId) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } @@ -298,27 +303,29 @@ func TestCreateOrUpdateIntakeWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getIntakeFails: tt.getFails, - getErrorCode: tt.getErrorCode, - returnIntake: tt.returnIntake, - intakeResponse: tt.intakeResponse, - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getIntakeFails: tt.getFails, + getErrorCode: tt.getErrorCode, + returnIntake: tt.returnIntake, + intakeResponse: tt.intakeResponse, + } - var wantResp *intake.IntakeResponse - if tt.wantResp { - wantResp = tt.intakeResponse - } + var wantResp *intake.IntakeResponse + if tt.wantResp { + wantResp = tt.intakeResponse + } - handler := CreateOrUpdateIntakeWaitHandler(context.Background(), apiClient, projectId, region, intakeId) - got, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + handler := CreateOrUpdateIntakeWaitHandler(context.Background(), apiClient, projectId, region, intakeId) + got, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(got, wantResp) { - t.Fatalf("handler got = %v, want %v", got, wantResp) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(got, wantResp) { + t.Fatalf("handler got = %v, want %v", got, wantResp) + } + }) }) } } @@ -354,20 +361,22 @@ func TestDeleteIntakeWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getIntakeFails: tt.getFails, - getErrorCode: tt.getErrorCode, - returnIntake: tt.returnIntake, - intakeResponse: &intake.IntakeResponse{ - Id: utils.Ptr(intakeId), - }, - } - handler := DeleteIntakeWaitHandler(context.Background(), apiClient, projectId, region, intakeId) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getIntakeFails: tt.getFails, + getErrorCode: tt.getErrorCode, + returnIntake: tt.returnIntake, + intakeResponse: &intake.IntakeResponse{ + Id: utils.Ptr(intakeId), + }, + } + handler := DeleteIntakeWaitHandler(context.Background(), apiClient, projectId, region, intakeId) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } @@ -442,27 +451,29 @@ func TestCreateOrUpdateIntakeUserWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getUserFails: tt.getFails, - getErrorCode: tt.getErrorCode, - returnUser: tt.returnUser, - intakeUserResponse: tt.intakeUserResponse, - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getUserFails: tt.getFails, + getErrorCode: tt.getErrorCode, + returnUser: tt.returnUser, + intakeUserResponse: tt.intakeUserResponse, + } - var wantResp *intake.IntakeUserResponse - if tt.wantResp { - wantResp = tt.intakeUserResponse - } + var wantResp *intake.IntakeUserResponse + if tt.wantResp { + wantResp = tt.intakeUserResponse + } - handler := CreateOrUpdateIntakeUserWaitHandler(context.Background(), apiClient, projectId, region, intakeId, intakeUserId) - got, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + handler := CreateOrUpdateIntakeUserWaitHandler(context.Background(), apiClient, projectId, region, intakeId, intakeUserId) + got, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(got, wantResp) { - t.Fatalf("handler got = %v, want %v", got, wantResp) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(got, wantResp) { + t.Fatalf("handler got = %v, want %v", got, wantResp) + } + }) }) } } @@ -498,20 +509,22 @@ func TestDeleteIntakeUserWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getUserFails: tt.getFails, - getErrorCode: tt.getErrorCode, - returnUser: tt.returnUser, - intakeUserResponse: &intake.IntakeUserResponse{ - Id: utils.Ptr(intakeUserId), - }, - } - handler := DeleteIntakeUserWaitHandler(context.Background(), apiClient, projectId, region, intakeId, intakeUserId) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getUserFails: tt.getFails, + getErrorCode: tt.getErrorCode, + returnUser: tt.returnUser, + intakeUserResponse: &intake.IntakeUserResponse{ + Id: utils.Ptr(intakeUserId), + }, + } + handler := DeleteIntakeUserWaitHandler(context.Background(), apiClient, projectId, region, intakeId, intakeUserId) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } diff --git a/services/kms/v1api/wait/wait_test.go b/services/kms/v1api/wait/wait_test.go index b0d026326..0db665716 100644 --- a/services/kms/v1api/wait/wait_test.go +++ b/services/kms/v1api/wait/wait_test.go @@ -5,6 +5,7 @@ import ( "errors" "net/http" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -196,23 +197,22 @@ func TestCreateKeyRingWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - ctx := context.Background() - client := newAPIMock(&mockSettings{ - keyRingResponses: tt.responses, - }) - - handler := CreateKeyRingWaitHandler(ctx, client, testProject, testRegion, testKeyRingId) - got, err := handler.SetTimeout(250 * time.Millisecond). - SetThrottle(1). - WaitWithContext(ctx) - - if (err != nil) != tt.wantErr { - t.Fatalf("unexpected error response. want %v but got %v ", tt.wantErr, err) - } + synctest.Test(t, func(t *testing.T) { + ctx := t.Context() + client := newAPIMock(&mockSettings{ + keyRingResponses: tt.responses, + }) + + handler := CreateKeyRingWaitHandler(ctx, client, testProject, testRegion, testKeyRingId) + got, err := handler.WaitWithContext(ctx) + if (err != nil) != tt.wantErr { + t.Fatalf("unexpected error response. want %v but got %v ", tt.wantErr, err) + } - if diff := cmp.Diff(tt.want, got); diff != "" { - t.Errorf("differing key ring %s", diff) - } + if diff := cmp.Diff(tt.want, got); diff != "" { + t.Errorf("differing key ring %s", diff) + } + }) }) } } @@ -274,23 +274,23 @@ func TestCreateOrUpdateKeyWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - ctx := context.Background() - client := newAPIMock(&mockSettings{ - keyResponses: tt.responses, - }) + synctest.Test(t, func(t *testing.T) { + ctx := context.Background() + client := newAPIMock(&mockSettings{ + keyResponses: tt.responses, + }) - handler := CreateOrUpdateKeyWaitHandler(ctx, client, testProject, testRegion, testKeyRingId, testKeyId) - got, err := handler.SetTimeout(250 * time.Millisecond). - SetThrottle(1). - WaitWithContext(ctx) + handler := CreateOrUpdateKeyWaitHandler(ctx, client, testProject, testRegion, testKeyRingId, testKeyId) + got, err := handler.WaitWithContext(ctx) - if (err != nil) != tt.wantErr { - t.Fatalf("unexpected error response. want %v but got %v ", tt.wantErr, err) - } + if (err != nil) != tt.wantErr { + t.Fatalf("unexpected error response. want %v but got %v ", tt.wantErr, err) + } - if diff := cmp.Diff(tt.want, got); diff != "" { - t.Errorf("differing key %s", diff) - } + if diff := cmp.Diff(tt.want, got); diff != "" { + t.Errorf("differing key %s", diff) + } + }) }) } } @@ -359,25 +359,25 @@ func TestDeleteKeyWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - ctx := context.Background() - client := newAPIMock(&mockSettings{ - keyResponses: tt.responses, - }) + synctest.Test(t, func(t *testing.T) { + ctx := context.Background() + client := newAPIMock(&mockSettings{ + keyResponses: tt.responses, + }) + + handler := DeleteKeyWaitHandler(ctx, client, testProject, testRegion, testKeyRingId, testKeyId) + _, err := handler.WaitWithContext(ctx) - handler := DeleteKeyWaitHandler(ctx, client, testProject, testRegion, testKeyRingId, testKeyId) - _, err := handler.SetTimeout(250 * time.Millisecond). - SetThrottle(1). - WaitWithContext(ctx) - - if tt.wantErr != (err != nil) { - t.Fatalf("wrong error result. want err: %v got %v", tt.wantErr, err) - } - if tt.wantErr { - var apiErr *oapierror.GenericOpenAPIError - if !errors.As(err, &apiErr) { - t.Fatalf("expected openapi error, got %v", err) + if tt.wantErr != (err != nil) { + t.Fatalf("wrong error result. want err: %v got %v", tt.wantErr, err) + } + if tt.wantErr { + var apiErr *oapierror.GenericOpenAPIError + if !errors.As(err, &apiErr) { + t.Fatalf("expected openapi error, got %v", err) + } } - } + }) }) } } @@ -487,23 +487,23 @@ func TestEnableKeyVersionWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - ctx := context.Background() - client := newAPIMock(&mockSettings{ - versionResponses: tt.responses, - }) + synctest.Test(t, func(t *testing.T) { + ctx := context.Background() + client := newAPIMock(&mockSettings{ + versionResponses: tt.responses, + }) - handler := EnableKeyVersionWaitHandler(ctx, client, testProject, testRegion, testKeyRingId, testKeyId, 1) - got, err := handler.SetTimeout(250 * time.Millisecond). - SetThrottle(1). - WaitWithContext(ctx) + handler := EnableKeyVersionWaitHandler(ctx, client, testProject, testRegion, testKeyRingId, testKeyId, 1) + got, err := handler.WaitWithContext(ctx) - if (err != nil) != tt.wantErr { - t.Fatalf("unexpected error response. want %v but got %v ", tt.wantErr, err) - } + if (err != nil) != tt.wantErr { + t.Fatalf("unexpected error response. want %v but got %v ", tt.wantErr, err) + } - if diff := cmp.Diff(tt.want, got); diff != "" { - t.Errorf("differing version %s", diff) - } + if diff := cmp.Diff(tt.want, got); diff != "" { + t.Errorf("differing version %s", diff) + } + }) }) } } @@ -595,23 +595,23 @@ func TestDisableKeyVersionWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - ctx := context.Background() - client := newAPIMock(&mockSettings{ - versionResponses: tt.responses, - }) + synctest.Test(t, func(t *testing.T) { + ctx := context.Background() + client := newAPIMock(&mockSettings{ + versionResponses: tt.responses, + }) - handler := DisableKeyVersionWaitHandler(ctx, client, testProject, testRegion, testKeyRingId, testKeyId, 1) - got, err := handler.SetTimeout(250 * time.Millisecond). - SetThrottle(1). - WaitWithContext(ctx) + handler := DisableKeyVersionWaitHandler(ctx, client, testProject, testRegion, testKeyRingId, testKeyId, 1) + got, err := handler.WaitWithContext(ctx) - if (err != nil) != tt.wantErr { - t.Fatalf("unexpected error response. want %v but got %v ", tt.wantErr, err) - } + if (err != nil) != tt.wantErr { + t.Fatalf("unexpected error response. want %v but got %v ", tt.wantErr, err) + } - if diff := cmp.Diff(tt.want, got); diff != "" { - t.Errorf("differing version %s", diff) - } + if diff := cmp.Diff(tt.want, got); diff != "" { + t.Errorf("differing version %s", diff) + } + }) }) } } @@ -673,23 +673,23 @@ func TestCreateWrappingWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - ctx := context.Background() - client := newAPIMock(&mockSettings{ - wrappingKeyResponses: tt.responses, - }) + synctest.Test(t, func(t *testing.T) { + ctx := context.Background() + client := newAPIMock(&mockSettings{ + wrappingKeyResponses: tt.responses, + }) - handler := CreateWrappingKeyWaitHandler(ctx, client, testProject, testRegion, testKeyRingId, testKeyId) - got, err := handler.SetTimeout(250 * time.Millisecond). - SetThrottle(1). - WaitWithContext(ctx) + handler := CreateWrappingKeyWaitHandler(ctx, client, testProject, testRegion, testKeyRingId, testKeyId) + got, err := handler.WaitWithContext(ctx) - if (err != nil) != tt.wantErr { - t.Fatalf("unexpected error response. want %v but got %v ", tt.wantErr, err) - } + if (err != nil) != tt.wantErr { + t.Fatalf("unexpected error response. want %v but got %v ", tt.wantErr, err) + } - if diff := cmp.Diff(tt.want, got); diff != "" { - t.Errorf("differing wrapping key %s", diff) - } + if diff := cmp.Diff(tt.want, got); diff != "" { + t.Errorf("differing wrapping key %s", diff) + } + }) }) } } diff --git a/services/kms/wait/wait_test.go b/services/kms/wait/wait_test.go index 2a61c70ca..3824d2ded 100644 --- a/services/kms/wait/wait_test.go +++ b/services/kms/wait/wait_test.go @@ -5,6 +5,7 @@ import ( "errors" "net/http" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -198,23 +199,23 @@ func TestCreateKeyRingWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - ctx := context.Background() - client := &apiKmsMocked{ - keyRingResponses: tt.responses, - } - - handler := CreateKeyRingWaitHandler(ctx, client, testProject, testRegion, testKeyRingId) - got, err := handler.SetTimeout(250 * time.Millisecond). - SetThrottle(1). - WaitWithContext(ctx) - - if (err != nil) != tt.wantErr { - t.Fatalf("unexpected error response. want %v but got %v ", tt.wantErr, err) - } - - if diff := cmp.Diff(tt.want, got); diff != "" { - t.Errorf("differing key ring %s", diff) - } + synctest.Test(t, func(t *testing.T) { + ctx := context.Background() + client := &apiKmsMocked{ + keyRingResponses: tt.responses, + } + + handler := CreateKeyRingWaitHandler(ctx, client, testProject, testRegion, testKeyRingId) + got, err := handler.WaitWithContext(ctx) + + if (err != nil) != tt.wantErr { + t.Fatalf("unexpected error response. want %v but got %v ", tt.wantErr, err) + } + + if diff := cmp.Diff(tt.want, got); diff != "" { + t.Errorf("differing key ring %s", diff) + } + }) }) } } @@ -276,23 +277,23 @@ func TestCreateOrUpdateKeyWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - ctx := context.Background() - client := &apiKmsMocked{ - keyResponses: tt.responses, - } - - handler := CreateOrUpdateKeyWaitHandler(ctx, client, testProject, testRegion, testKeyRingId, testKeyId) - got, err := handler.SetTimeout(250 * time.Millisecond). - SetThrottle(1). - WaitWithContext(ctx) - - if (err != nil) != tt.wantErr { - t.Fatalf("unexpected error response. want %v but got %v ", tt.wantErr, err) - } - - if diff := cmp.Diff(tt.want, got); diff != "" { - t.Errorf("differing key %s", diff) - } + synctest.Test(t, func(t *testing.T) { + ctx := context.Background() + client := &apiKmsMocked{ + keyResponses: tt.responses, + } + + handler := CreateOrUpdateKeyWaitHandler(ctx, client, testProject, testRegion, testKeyRingId, testKeyId) + got, err := handler.WaitWithContext(ctx) + + if (err != nil) != tt.wantErr { + t.Fatalf("unexpected error response. want %v but got %v ", tt.wantErr, err) + } + + if diff := cmp.Diff(tt.want, got); diff != "" { + t.Errorf("differing key %s", diff) + } + }) }) } } @@ -361,24 +362,24 @@ func TestDeleteKeyWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - ctx := context.Background() - client := &apiKmsMocked{ - keyResponses: tt.responses, - } - handler := DeleteKeyWaitHandler(ctx, client, testProject, testRegion, testKeyRingId, testKeyId) - _, err := handler.SetTimeout(250 * time.Millisecond). - SetThrottle(1). - WaitWithContext(ctx) - - if tt.wantErr != (err != nil) { - t.Fatalf("wrong error result. want err: %v got %v", tt.wantErr, err) - } - if tt.wantErr { - var apiErr *oapierror.GenericOpenAPIError - if !errors.As(err, &apiErr) { - t.Fatalf("expected openapi error, got %v", err) + synctest.Test(t, func(t *testing.T) { + ctx := context.Background() + client := &apiKmsMocked{ + keyResponses: tt.responses, } - } + handler := DeleteKeyWaitHandler(ctx, client, testProject, testRegion, testKeyRingId, testKeyId) + _, err := handler.WaitWithContext(ctx) + + if tt.wantErr != (err != nil) { + t.Fatalf("wrong error result. want err: %v got %v", tt.wantErr, err) + } + if tt.wantErr { + var apiErr *oapierror.GenericOpenAPIError + if !errors.As(err, &apiErr) { + t.Fatalf("expected openapi error, got %v", err) + } + } + }) }) } } @@ -488,23 +489,23 @@ func TestEnableKeyVersionWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - ctx := context.Background() - client := &apiKmsMocked{ - versionResponses: tt.responses, - } - - handler := EnableKeyVersionWaitHandler(ctx, client, testProject, testRegion, testKeyRingId, testKeyId, 1) - got, err := handler.SetTimeout(250 * time.Millisecond). - SetThrottle(1). - WaitWithContext(ctx) - - if (err != nil) != tt.wantErr { - t.Fatalf("unexpected error response. want %v but got %v ", tt.wantErr, err) - } - - if diff := cmp.Diff(tt.want, got); diff != "" { - t.Errorf("differing version %s", diff) - } + synctest.Test(t, func(t *testing.T) { + ctx := context.Background() + client := &apiKmsMocked{ + versionResponses: tt.responses, + } + + handler := EnableKeyVersionWaitHandler(ctx, client, testProject, testRegion, testKeyRingId, testKeyId, 1) + got, err := handler.WaitWithContext(ctx) + + if (err != nil) != tt.wantErr { + t.Fatalf("unexpected error response. want %v but got %v ", tt.wantErr, err) + } + + if diff := cmp.Diff(tt.want, got); diff != "" { + t.Errorf("differing version %s", diff) + } + }) }) } } @@ -596,22 +597,22 @@ func TestDisableKeyVersionWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - ctx := context.Background() - client := &apiKmsMocked{ - versionResponses: tt.responses, - } - handler := DisableKeyVersionWaitHandler(ctx, client, testProject, testRegion, testKeyRingId, testKeyId, 1) - got, err := handler.SetTimeout(250 * time.Millisecond). - SetThrottle(1). - WaitWithContext(ctx) - - if (err != nil) != tt.wantErr { - t.Fatalf("unexpected error response. want %v but got %v ", tt.wantErr, err) - } - - if diff := cmp.Diff(tt.want, got); diff != "" { - t.Errorf("differing version %s", diff) - } + synctest.Test(t, func(t *testing.T) { + ctx := context.Background() + client := &apiKmsMocked{ + versionResponses: tt.responses, + } + handler := DisableKeyVersionWaitHandler(ctx, client, testProject, testRegion, testKeyRingId, testKeyId, 1) + got, err := handler.WaitWithContext(ctx) + + if (err != nil) != tt.wantErr { + t.Fatalf("unexpected error response. want %v but got %v ", tt.wantErr, err) + } + + if diff := cmp.Diff(tt.want, got); diff != "" { + t.Errorf("differing version %s", diff) + } + }) }) } } @@ -673,23 +674,23 @@ func TestCreateWrappingWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - ctx := context.Background() - client := &apiKmsMocked{ - wrappingKeyResponses: tt.responses, - } - - handler := CreateWrappingKeyWaitHandler(ctx, client, testProject, testRegion, testKeyRingId, testKeyId) - got, err := handler.SetTimeout(250 * time.Millisecond). - SetThrottle(1). - WaitWithContext(ctx) - - if (err != nil) != tt.wantErr { - t.Fatalf("unexpected error response. want %v but got %v ", tt.wantErr, err) - } - - if diff := cmp.Diff(tt.want, got); diff != "" { - t.Errorf("differing wrapping key %s", diff) - } + synctest.Test(t, func(t *testing.T) { + ctx := context.Background() + client := &apiKmsMocked{ + wrappingKeyResponses: tt.responses, + } + + handler := CreateWrappingKeyWaitHandler(ctx, client, testProject, testRegion, testKeyRingId, testKeyId) + got, err := handler.WaitWithContext(ctx) + + if (err != nil) != tt.wantErr { + t.Fatalf("unexpected error response. want %v but got %v ", tt.wantErr, err) + } + + if diff := cmp.Diff(tt.want, got); diff != "" { + t.Errorf("differing wrapping key %s", diff) + } + }) }) } } diff --git a/services/loadbalancer/v2api/wait/wait_test.go b/services/loadbalancer/v2api/wait/wait_test.go index 29ded3002..d96e8066a 100644 --- a/services/loadbalancer/v2api/wait/wait_test.go +++ b/services/loadbalancer/v2api/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -89,32 +90,34 @@ func TestCreateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceName := "foo-bar" - - apiClient := newAPIMock(&mockSettings{ - instanceName: instanceName, - instanceStatus: tt.instanceStatus, - instanceGetFails: tt.instanceGetFails, - }) - - var wantRes *loadbalancer.LoadBalancer - if tt.wantResp { - wantRes = &loadbalancer.LoadBalancer{ - Name: &instanceName, - Status: tt.instanceStatus, + synctest.Test(t, func(t *testing.T) { + instanceName := "foo-bar" + + apiClient := newAPIMock(&mockSettings{ + instanceName: instanceName, + instanceStatus: tt.instanceStatus, + instanceGetFails: tt.instanceGetFails, + }) + + var wantRes *loadbalancer.LoadBalancer + if tt.wantResp { + wantRes = &loadbalancer.LoadBalancer{ + Name: &instanceName, + Status: tt.instanceStatus, + } } - } - handler := CreateLoadBalancerWaitHandler(context.Background(), apiClient, "", testRegion, instanceName) + handler := CreateLoadBalancerWaitHandler(context.Background(), apiClient, "", testRegion, instanceName) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -146,21 +149,23 @@ func TestDeleteInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceName := "foo-bar" + synctest.Test(t, func(t *testing.T) { + instanceName := "foo-bar" - apiClient := newAPIMock(&mockSettings{ - instanceGetFails: tt.instanceGetFails, - instanceName: instanceName, - instanceIsDeleted: tt.instanceIsDeleted, - }) + apiClient := newAPIMock(&mockSettings{ + instanceGetFails: tt.instanceGetFails, + instanceName: instanceName, + instanceIsDeleted: tt.instanceIsDeleted, + }) - handler := DeleteLoadBalancerWaitHandler(context.Background(), apiClient, "", testRegion, instanceName) + handler := DeleteLoadBalancerWaitHandler(context.Background(), apiClient, "", testRegion, instanceName) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } diff --git a/services/loadbalancer/wait/wait_test.go b/services/loadbalancer/wait/wait_test.go index 2531d2084..3f328a88e 100644 --- a/services/loadbalancer/wait/wait_test.go +++ b/services/loadbalancer/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -86,32 +87,34 @@ func TestCreateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceName := "foo-bar" - - apiClient := &apiClientMocked{ - instanceName: instanceName, - instanceStatus: tt.instanceStatus, - instanceGetFails: tt.instanceGetFails, - } - - var wantRes *loadbalancer.LoadBalancer - if tt.wantResp { - wantRes = &loadbalancer.LoadBalancer{ - Name: &instanceName, - Status: utils.Ptr(tt.instanceStatus), + synctest.Test(t, func(t *testing.T) { + instanceName := "foo-bar" + + apiClient := &apiClientMocked{ + instanceName: instanceName, + instanceStatus: tt.instanceStatus, + instanceGetFails: tt.instanceGetFails, + } + + var wantRes *loadbalancer.LoadBalancer + if tt.wantResp { + wantRes = &loadbalancer.LoadBalancer{ + Name: &instanceName, + Status: utils.Ptr(tt.instanceStatus), + } } - } - handler := CreateLoadBalancerWaitHandler(context.Background(), apiClient, "", testRegion, instanceName) + handler := CreateLoadBalancerWaitHandler(context.Background(), apiClient, "", testRegion, instanceName) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -143,21 +146,23 @@ func TestDeleteInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceName := "foo-bar" + synctest.Test(t, func(t *testing.T) { + instanceName := "foo-bar" - apiClient := &apiClientMocked{ - instanceGetFails: tt.instanceGetFails, - instanceName: instanceName, - instanceIsDeleted: tt.instanceIsDeleted, - } + apiClient := &apiClientMocked{ + instanceGetFails: tt.instanceGetFails, + instanceName: instanceName, + instanceIsDeleted: tt.instanceIsDeleted, + } - handler := DeleteLoadBalancerWaitHandler(context.Background(), apiClient, "", testRegion, instanceName) + handler := DeleteLoadBalancerWaitHandler(context.Background(), apiClient, "", testRegion, instanceName) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } diff --git a/services/logme/v1api/wait/wait_test.go b/services/logme/v1api/wait/wait_test.go index 8cde4e1a8..0ff0096a4 100644 --- a/services/logme/v1api/wait/wait_test.go +++ b/services/logme/v1api/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -114,33 +115,35 @@ func TestCreateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := newAPIMock(&mockSettings{ - instanceGetFails: tt.getFails, - instanceResourceId: instanceId, - instanceResourceState: tt.resourceState, - }) - - var wantRes *logme.Instance - if tt.wantResp { - wantRes = &logme.Instance{ - InstanceId: &instanceId, - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := newAPIMock(&mockSettings{ + instanceGetFails: tt.getFails, + instanceResourceId: instanceId, + instanceResourceState: tt.resourceState, + }) + + var wantRes *logme.Instance + if tt.wantResp { + wantRes = &logme.Instance{ + InstanceId: &instanceId, + Status: utils.Ptr(tt.resourceState), + } } - } - handler := CreateInstanceWaitHandler(context.Background(), apiClient, "pid", instanceId) + handler := CreateInstanceWaitHandler(context.Background(), apiClient, "pid", instanceId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - diff := cmp.Diff(gotRes, wantRes) - if diff != "" { - t.Fatalf("handler gotRes = %+v\n want %+v\n diff = %s", gotRes, wantRes, diff) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + diff := cmp.Diff(gotRes, wantRes) + if diff != "" { + t.Fatalf("handler gotRes = %+v\n want %+v\n diff = %s", gotRes, wantRes, diff) + } + }) }) } } diff --git a/services/logme/wait/wait_test.go b/services/logme/wait/wait_test.go index 38dec2bae..8c813fe43 100644 --- a/services/logme/wait/wait_test.go +++ b/services/logme/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -115,33 +116,35 @@ func TestCreateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := &apiClientInstanceMocked{ - getFails: tt.getFails, - resourceId: instanceId, - resourceState: tt.resourceState, - } - - var wantRes *logme.Instance - if tt.wantResp { - wantRes = &logme.Instance{ - InstanceId: &instanceId, - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := &apiClientInstanceMocked{ + getFails: tt.getFails, + resourceId: instanceId, + resourceState: tt.resourceState, + } + + var wantRes *logme.Instance + if tt.wantResp { + wantRes = &logme.Instance{ + InstanceId: &instanceId, + Status: utils.Ptr(tt.resourceState), + } } - } - handler := CreateInstanceWaitHandler(context.Background(), apiClient, "pid", instanceId) + handler := CreateInstanceWaitHandler(context.Background(), apiClient, "pid", instanceId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - diff := cmp.Diff(gotRes, wantRes) - if diff != "" { - t.Fatalf("handler gotRes = %+v\n want %+v\n diff = %s", gotRes, wantRes, diff) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + diff := cmp.Diff(gotRes, wantRes) + if diff != "" { + t.Fatalf("handler gotRes = %+v\n want %+v\n diff = %s", gotRes, wantRes, diff) + } + }) }) } } @@ -184,32 +187,34 @@ func TestUpdateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := &apiClientInstanceMocked{ - getFails: tt.getFails, - resourceId: instanceId, - resourceState: tt.resourceState, - } - - var wantRes *logme.Instance - if tt.wantResp { - wantRes = &logme.Instance{ - InstanceId: &instanceId, - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := &apiClientInstanceMocked{ + getFails: tt.getFails, + resourceId: instanceId, + resourceState: tt.resourceState, } - } - handler := PartialUpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId) + var wantRes *logme.Instance + if tt.wantResp { + wantRes = &logme.Instance{ + InstanceId: &instanceId, + Status: utils.Ptr(tt.resourceState), + } + } + + handler := PartialUpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -259,27 +264,29 @@ func TestDeleteInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := &apiClientInstanceMocked{ - getFails: tt.getFails, - deletionSucceedsWithErrors: tt.deleteSucceeedsWithErrors, - resourceId: instanceId, - resourceOperation: utils.Ptr(deleteOperation), - resourceDescription: tt.resourceDescription, - resourceState: tt.resourceState, - } - - handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", instanceId) - - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if err == nil && gotRes != nil { - t.Fatalf("handler gotRes = %v, want %v", gotRes, nil) - } + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := &apiClientInstanceMocked{ + getFails: tt.getFails, + deletionSucceedsWithErrors: tt.deleteSucceeedsWithErrors, + resourceId: instanceId, + resourceOperation: utils.Ptr(deleteOperation), + resourceDescription: tt.resourceDescription, + resourceState: tt.resourceState, + } + + handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", instanceId) + + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if err == nil && gotRes != nil { + t.Fatalf("handler gotRes = %v, want %v", gotRes, nil) + } + }) }) } } @@ -315,31 +322,33 @@ func TestCreateCredentialsWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - credentialsId := "foo-bar" - - apiClient := &apiClientCredentialsMocked{ - getFails: tt.getFails, - resourceId: credentialsId, - operationSucceeds: tt.operationSucceeds, - } - - var wantRes *logme.CredentialsResponse - if tt.wantResp { - wantRes = &logme.CredentialsResponse{ - Id: &credentialsId, + synctest.Test(t, func(t *testing.T) { + credentialsId := "foo-bar" + + apiClient := &apiClientCredentialsMocked{ + getFails: tt.getFails, + resourceId: credentialsId, + operationSucceeds: tt.operationSucceeds, + } + + var wantRes *logme.CredentialsResponse + if tt.wantResp { + wantRes = &logme.CredentialsResponse{ + Id: &credentialsId, + } } - } - handler := CreateCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) + handler := CreateCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -372,22 +381,24 @@ func TestDeleteCredentialsWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - credentialsId := "foo-bar" - - apiClient := &apiClientCredentialsMocked{ - getFails: tt.getFails, - resourceId: credentialsId, - operationSucceeds: true, - deletionSucceeds: tt.deletionSucceeds, - } + synctest.Test(t, func(t *testing.T) { + credentialsId := "foo-bar" + + apiClient := &apiClientCredentialsMocked{ + getFails: tt.getFails, + resourceId: credentialsId, + operationSucceeds: true, + deletionSucceeds: tt.deletionSucceeds, + } - handler := DeleteCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) + handler := DeleteCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } diff --git a/services/logs/v1api/wait/wait_test.go b/services/logs/v1api/wait/wait_test.go index bc761d5f0..8ed440553 100644 --- a/services/logs/v1api/wait/wait_test.go +++ b/services/logs/v1api/wait/wait_test.go @@ -4,6 +4,7 @@ import ( "context" "net/http" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -107,27 +108,29 @@ func TestCreateLogsInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.description, func(t *testing.T) { - client := newAPIMock(mockSettings{ - getFails: tt.getFails, - getLogsResponse: tt.getLogsResponse, - returnInstance: tt.returnInstance, - }) + synctest.Test(t, func(t *testing.T) { + client := newAPIMock(mockSettings{ + getFails: tt.getFails, + getLogsResponse: tt.getLogsResponse, + returnInstance: tt.returnInstance, + }) - var instanceWanted *logs.LogsInstance - if tt.wantResp { - instanceWanted = tt.getLogsResponse - } + var instanceWanted *logs.LogsInstance + if tt.wantResp { + instanceWanted = tt.getLogsResponse + } - handler := CreateLogsInstanceWaitHandler(context.Background(), client, projectId, region, instanceId) + handler := CreateLogsInstanceWaitHandler(context.Background(), client, projectId, region, instanceId) - response, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + response, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(response, instanceWanted) { - t.Fatalf("handler gotRes = %v, want %v", response, instanceWanted) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(response, instanceWanted) { + t.Fatalf("handler gotRes = %v, want %v", response, instanceWanted) + } + }) }) } } @@ -159,18 +162,20 @@ func TestDeleteLogsInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.description, func(t *testing.T) { - client := newAPIMock(mockSettings{ - getFails: tt.getFails, - returnInstance: false, - statusCode: tt.statusCode, - getLogsResponse: nil, - }) + synctest.Test(t, func(t *testing.T) { + client := newAPIMock(mockSettings{ + getFails: tt.getFails, + returnInstance: false, + statusCode: tt.statusCode, + getLogsResponse: nil, + }) - handler := DeleteLogsInstanceWaitHandler(context.Background(), client, projectId, region, instanceId) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + handler := DeleteLogsInstanceWaitHandler(context.Background(), client, projectId, region, instanceId) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } diff --git a/services/logs/wait/wait_test.go b/services/logs/wait/wait_test.go index fd1fa2473..0abe95407 100644 --- a/services/logs/wait/wait_test.go +++ b/services/logs/wait/wait_test.go @@ -4,6 +4,7 @@ import ( "context" "net/http" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -103,26 +104,28 @@ func TestCreateLogsInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.description, func(t *testing.T) { - client := &apiClientMock{ - getFails: tt.getFails, - getLogsResponse: tt.getLogsResponse, - returnInstance: tt.returnInstance, - } - var instanceWanted *logs.LogsInstance - if tt.wantResp { - instanceWanted = tt.getLogsResponse - } + synctest.Test(t, func(t *testing.T) { + client := &apiClientMock{ + getFails: tt.getFails, + getLogsResponse: tt.getLogsResponse, + returnInstance: tt.returnInstance, + } + var instanceWanted *logs.LogsInstance + if tt.wantResp { + instanceWanted = tt.getLogsResponse + } - handler := CreateLogsInstanceWaitHandler(context.Background(), client, projectId, region, instanceId) + handler := CreateLogsInstanceWaitHandler(context.Background(), client, projectId, region, instanceId) - response, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + response, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(response, instanceWanted) { - t.Fatalf("handler gotRes = %v, want %v", response, instanceWanted) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(response, instanceWanted) { + t.Fatalf("handler gotRes = %v, want %v", response, instanceWanted) + } + }) }) } } @@ -154,17 +157,19 @@ func TestDeleteLogsInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.description, func(t *testing.T) { - client := &apiClientMock{ - getFails: tt.getFails, - returnInstance: false, - statusCode: tt.statusCode, - getLogsResponse: nil, - } - handler := DeleteLogsInstanceWaitHandler(context.Background(), client, projectId, region, instanceId) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + synctest.Test(t, func(t *testing.T) { + client := &apiClientMock{ + getFails: tt.getFails, + returnInstance: false, + statusCode: tt.statusCode, + getLogsResponse: nil, + } + handler := DeleteLogsInstanceWaitHandler(context.Background(), client, projectId, region, instanceId) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } diff --git a/services/mariadb/v1api/wait/wait_test.go b/services/mariadb/v1api/wait/wait_test.go index 15202da1f..a98a66d7c 100644 --- a/services/mariadb/v1api/wait/wait_test.go +++ b/services/mariadb/v1api/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -114,33 +115,35 @@ func TestCreateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := newAPIMock(&mockSettings{ - instanceGetFails: tt.getFails, - instanceResourceId: instanceId, - instanceResourceState: tt.resourceState, - }) - - var wantRes *mariadb.Instance - if tt.wantResp { - wantRes = &mariadb.Instance{ - InstanceId: &instanceId, - Status: tt.resourceState, + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := newAPIMock(&mockSettings{ + instanceGetFails: tt.getFails, + instanceResourceId: instanceId, + instanceResourceState: tt.resourceState, + }) + + var wantRes *mariadb.Instance + if tt.wantResp { + wantRes = &mariadb.Instance{ + InstanceId: &instanceId, + Status: tt.resourceState, + } } - } - handler := CreateInstanceWaitHandler(context.Background(), apiClient, "pid", instanceId) + handler := CreateInstanceWaitHandler(context.Background(), apiClient, "pid", instanceId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - diff := cmp.Diff(gotRes, wantRes) - if diff != "" { - t.Fatalf("handler gotRes = %+v\n want %+v\n diff = %s", gotRes, wantRes, diff) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + diff := cmp.Diff(gotRes, wantRes) + if diff != "" { + t.Fatalf("handler gotRes = %+v\n want %+v\n diff = %s", gotRes, wantRes, diff) + } + }) }) } } @@ -183,32 +186,34 @@ func TestUpdateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := newAPIMock(&mockSettings{ - instanceGetFails: tt.getFails, - instanceResourceId: instanceId, - instanceResourceState: tt.resourceState, - }) - - var wantRes *mariadb.Instance - if tt.wantResp { - wantRes = &mariadb.Instance{ - InstanceId: &instanceId, - Status: tt.resourceState, + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := newAPIMock(&mockSettings{ + instanceGetFails: tt.getFails, + instanceResourceId: instanceId, + instanceResourceState: tt.resourceState, + }) + + var wantRes *mariadb.Instance + if tt.wantResp { + wantRes = &mariadb.Instance{ + InstanceId: &instanceId, + Status: tt.resourceState, + } } - } - handler := PartialUpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId) + handler := PartialUpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } diff --git a/services/mariadb/wait/wait_test.go b/services/mariadb/wait/wait_test.go index bb584edb7..48d7527df 100644 --- a/services/mariadb/wait/wait_test.go +++ b/services/mariadb/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -115,33 +116,35 @@ func TestCreateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := &apiClientInstanceMocked{ - getFails: tt.getFails, - resourceId: instanceId, - resourceState: tt.resourceState, - } - - var wantRes *mariadb.Instance - if tt.wantResp { - wantRes = &mariadb.Instance{ - InstanceId: &instanceId, - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := &apiClientInstanceMocked{ + getFails: tt.getFails, + resourceId: instanceId, + resourceState: tt.resourceState, + } + + var wantRes *mariadb.Instance + if tt.wantResp { + wantRes = &mariadb.Instance{ + InstanceId: &instanceId, + Status: utils.Ptr(tt.resourceState), + } } - } - handler := CreateInstanceWaitHandler(context.Background(), apiClient, "pid", instanceId) + handler := CreateInstanceWaitHandler(context.Background(), apiClient, "pid", instanceId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - diff := cmp.Diff(gotRes, wantRes) - if diff != "" { - t.Fatalf("handler gotRes = %+v\n want %+v\n diff = %s", gotRes, wantRes, diff) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + diff := cmp.Diff(gotRes, wantRes) + if diff != "" { + t.Fatalf("handler gotRes = %+v\n want %+v\n diff = %s", gotRes, wantRes, diff) + } + }) }) } } @@ -184,32 +187,34 @@ func TestUpdateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := &apiClientInstanceMocked{ - getFails: tt.getFails, - resourceId: instanceId, - resourceState: tt.resourceState, - } - - var wantRes *mariadb.Instance - if tt.wantResp { - wantRes = &mariadb.Instance{ - InstanceId: &instanceId, - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := &apiClientInstanceMocked{ + getFails: tt.getFails, + resourceId: instanceId, + resourceState: tt.resourceState, } - } - handler := PartialUpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId) + var wantRes *mariadb.Instance + if tt.wantResp { + wantRes = &mariadb.Instance{ + InstanceId: &instanceId, + Status: utils.Ptr(tt.resourceState), + } + } + + handler := PartialUpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -254,24 +259,26 @@ func TestDeleteInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := &apiClientInstanceMocked{ - getFails: tt.getFails, - deletionSucceedsWithErrors: tt.deleteSucceeedsWithErrors, - resourceId: instanceId, - resourceOperation: utils.Ptr(deleteOperation), - resourceDescription: tt.resourceDescription, - resourceState: tt.resourceState, - } + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := &apiClientInstanceMocked{ + getFails: tt.getFails, + deletionSucceedsWithErrors: tt.deleteSucceeedsWithErrors, + resourceId: instanceId, + resourceOperation: utils.Ptr(deleteOperation), + resourceDescription: tt.resourceDescription, + resourceState: tt.resourceState, + } - handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", instanceId) + handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", instanceId) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } @@ -307,31 +314,33 @@ func TestCreateCredentialsWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - credentialsId := "foo-bar" - - apiClient := &apiClientCredentialsMocked{ - getFails: tt.getFails, - resourceId: credentialsId, - operationSucceeds: tt.operationSucceeds, - } - - var wantRes *mariadb.CredentialsResponse - if tt.wantResp { - wantRes = &mariadb.CredentialsResponse{ - Id: &credentialsId, + synctest.Test(t, func(t *testing.T) { + credentialsId := "foo-bar" + + apiClient := &apiClientCredentialsMocked{ + getFails: tt.getFails, + resourceId: credentialsId, + operationSucceeds: tt.operationSucceeds, + } + + var wantRes *mariadb.CredentialsResponse + if tt.wantResp { + wantRes = &mariadb.CredentialsResponse{ + Id: &credentialsId, + } } - } - handler := CreateCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) + handler := CreateCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -364,22 +373,24 @@ func TestDeleteCredentialsWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - credentialsId := "foo-bar" - - apiClient := &apiClientCredentialsMocked{ - getFails: tt.getFails, - resourceId: credentialsId, - operationSucceeds: true, - deletionSucceeds: tt.deletionSucceeds, - } + synctest.Test(t, func(t *testing.T) { + credentialsId := "foo-bar" + + apiClient := &apiClientCredentialsMocked{ + getFails: tt.getFails, + resourceId: credentialsId, + operationSucceeds: true, + deletionSucceeds: tt.deletionSucceeds, + } - handler := DeleteCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) + handler := DeleteCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } diff --git a/services/modelserving/v1api/wait/wait_test.go b/services/modelserving/v1api/wait/wait_test.go index 44978a810..f85cb4d82 100644 --- a/services/modelserving/v1api/wait/wait_test.go +++ b/services/modelserving/v1api/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -73,32 +74,34 @@ func TestCreateModelServingWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newAPIMock(&mockSettings{ - getFails: tt.getFails, - statusCode: tt.statusCode, - resourceState: tt.resourceState, - }) - - var wantRes *modelserving.GetTokenResponse - if tt.wantResp { - wantRes = &modelserving.GetTokenResponse{ - Token: modelserving.Token{ - State: tt.resourceState, - Id: "tid", - }, + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(&mockSettings{ + getFails: tt.getFails, + statusCode: tt.statusCode, + resourceState: tt.resourceState, + }) + + var wantRes *modelserving.GetTokenResponse + if tt.wantResp { + wantRes = &modelserving.GetTokenResponse{ + Token: modelserving.Token{ + State: tt.resourceState, + Id: "tid", + }, + } } - } - handler := CreateModelServingWaitHandler(context.Background(), apiClient, "region", "pid", "tid") + handler := CreateModelServingWaitHandler(context.Background(), apiClient, "region", "pid", "tid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -139,32 +142,34 @@ func TestUpdateModelServingWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newAPIMock(&mockSettings{ - getFails: tt.getFails, - statusCode: tt.statusCode, - resourceState: tt.resourceState, - }) - - var wantRes *modelserving.GetTokenResponse - if tt.wantResp { - wantRes = &modelserving.GetTokenResponse{ - Token: modelserving.Token{ - State: tt.resourceState, - Id: "tid", - }, + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(&mockSettings{ + getFails: tt.getFails, + statusCode: tt.statusCode, + resourceState: tt.resourceState, + }) + + var wantRes *modelserving.GetTokenResponse + if tt.wantResp { + wantRes = &modelserving.GetTokenResponse{ + Token: modelserving.Token{ + State: tt.resourceState, + Id: "tid", + }, + } } - } - handler := UpdateModelServingWaitHandler(context.Background(), apiClient, "region", "pid", "tid") + handler := UpdateModelServingWaitHandler(context.Background(), apiClient, "region", "pid", "tid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -205,32 +210,34 @@ func TestDeleteModelServingWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newAPIMock(&mockSettings{ - getFails: tt.getFails, - statusCode: tt.statusCode, - resourceState: tt.resourceState, - }) - - var wantRes *modelserving.GetTokenResponse - if tt.wantResp { - wantRes = &modelserving.GetTokenResponse{ - Token: modelserving.Token{ - State: tt.resourceState, - Id: "tid", - }, + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(&mockSettings{ + getFails: tt.getFails, + statusCode: tt.statusCode, + resourceState: tt.resourceState, + }) + + var wantRes *modelserving.GetTokenResponse + if tt.wantResp { + wantRes = &modelserving.GetTokenResponse{ + Token: modelserving.Token{ + State: tt.resourceState, + Id: "tid", + }, + } } - } - handler := DeleteModelServingWaitHandler(context.Background(), apiClient, "region", "pid", "tid") + handler := DeleteModelServingWaitHandler(context.Background(), apiClient, "region", "pid", "tid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } diff --git a/services/modelserving/wait/wait_test.go b/services/modelserving/wait/wait_test.go index 05110de70..1cca53e31 100644 --- a/services/modelserving/wait/wait_test.go +++ b/services/modelserving/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -69,32 +70,34 @@ func TestCreateModelServingWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getFails: tt.getFails, - statusCode: tt.statusCode, - resourceState: tt.resourceState, - } - - var wantRes *modelserving.GetTokenResponse - if tt.wantResp { - wantRes = &modelserving.GetTokenResponse{ - Token: &modelserving.Token{ - State: utils.Ptr(tt.resourceState), - Id: utils.Ptr("tid"), - }, + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getFails: tt.getFails, + statusCode: tt.statusCode, + resourceState: tt.resourceState, } - } - handler := CreateModelServingWaitHandler(context.Background(), apiClient, "region", "pid", "tid") + var wantRes *modelserving.GetTokenResponse + if tt.wantResp { + wantRes = &modelserving.GetTokenResponse{ + Token: &modelserving.Token{ + State: utils.Ptr(tt.resourceState), + Id: utils.Ptr("tid"), + }, + } + } + + handler := CreateModelServingWaitHandler(context.Background(), apiClient, "region", "pid", "tid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -135,32 +138,34 @@ func TestUpdateModelServingWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getFails: tt.getFails, - statusCode: tt.statusCode, - resourceState: tt.resourceState, - } - - var wantRes *modelserving.GetTokenResponse - if tt.wantResp { - wantRes = &modelserving.GetTokenResponse{ - Token: &modelserving.Token{ - State: utils.Ptr(tt.resourceState), - Id: utils.Ptr("tid"), - }, + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getFails: tt.getFails, + statusCode: tt.statusCode, + resourceState: tt.resourceState, + } + + var wantRes *modelserving.GetTokenResponse + if tt.wantResp { + wantRes = &modelserving.GetTokenResponse{ + Token: &modelserving.Token{ + State: utils.Ptr(tt.resourceState), + Id: utils.Ptr("tid"), + }, + } } - } - handler := UpdateModelServingWaitHandler(context.Background(), apiClient, "region", "pid", "tid") + handler := UpdateModelServingWaitHandler(context.Background(), apiClient, "region", "pid", "tid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -201,32 +206,34 @@ func TestDeleteModelServingWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getFails: tt.getFails, - statusCode: tt.statusCode, - resourceState: tt.resourceState, - } - - var wantRes *modelserving.GetTokenResponse - if tt.wantResp { - wantRes = &modelserving.GetTokenResponse{ - Token: &modelserving.Token{ - State: utils.Ptr(tt.resourceState), - Id: utils.Ptr("tid"), - }, + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getFails: tt.getFails, + statusCode: tt.statusCode, + resourceState: tt.resourceState, + } + + var wantRes *modelserving.GetTokenResponse + if tt.wantResp { + wantRes = &modelserving.GetTokenResponse{ + Token: &modelserving.Token{ + State: utils.Ptr(tt.resourceState), + Id: utils.Ptr("tid"), + }, + } } - } - handler := DeleteModelServingWaitHandler(context.Background(), apiClient, "region", "pid", "tid") + handler := DeleteModelServingWaitHandler(context.Background(), apiClient, "region", "pid", "tid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } diff --git a/services/mongodbflex/v2api/wait/wait_test.go b/services/mongodbflex/v2api/wait/wait_test.go index b5ddd0bb4..67e39849d 100644 --- a/services/mongodbflex/v2api/wait/wait_test.go +++ b/services/mongodbflex/v2api/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -112,34 +113,36 @@ func TestCreateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := newAPIMock(&mockSettings{ - instanceId: instanceId, - instanceState: tt.instanceState, - instanceGetFails: tt.instanceGetFails, - }) - - var wantRes *mongodbflex.InstanceResponse - if tt.wantResp { - wantRes = &mongodbflex.InstanceResponse{ - Item: &mongodbflex.Instance{ - Id: &instanceId, - Status: tt.instanceState, - }, + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := newAPIMock(&mockSettings{ + instanceId: instanceId, + instanceState: tt.instanceState, + instanceGetFails: tt.instanceGetFails, + }) + + var wantRes *mongodbflex.InstanceResponse + if tt.wantResp { + wantRes = &mongodbflex.InstanceResponse{ + Item: &mongodbflex.Instance{ + Id: &instanceId, + Status: tt.instanceState, + }, + } } - } - handler := CreateInstanceWaitHandler(context.Background(), apiClient, "", instanceId, testRegion) + handler := CreateInstanceWaitHandler(context.Background(), apiClient, "", instanceId, testRegion) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -189,34 +192,36 @@ func TestUpdateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := newAPIMock(&mockSettings{ - instanceId: instanceId, - instanceState: tt.instanceState, - instanceGetFails: tt.instanceGetFails, - }) - - var wantRes *mongodbflex.InstanceResponse - if tt.wantResp { - wantRes = &mongodbflex.InstanceResponse{ - Item: &mongodbflex.Instance{ - Id: &instanceId, - Status: tt.instanceState, - }, + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := newAPIMock(&mockSettings{ + instanceId: instanceId, + instanceState: tt.instanceState, + instanceGetFails: tt.instanceGetFails, + }) + + var wantRes *mongodbflex.InstanceResponse + if tt.wantResp { + wantRes = &mongodbflex.InstanceResponse{ + Item: &mongodbflex.Instance{ + Id: &instanceId, + Status: tt.instanceState, + }, + } } - } - handler := UpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId, testRegion) + handler := UpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId, testRegion) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -248,22 +253,24 @@ func TestDeleteInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" - apiClient := newAPIMock(&mockSettings{ - instanceGetFails: tt.instanceGetFails, - instanceIsDeleted: tt.instanceState != nil && *tt.instanceState == INSTANCESTATUS_READY, - instanceId: instanceId, - instanceState: tt.instanceState, - }) + apiClient := newAPIMock(&mockSettings{ + instanceGetFails: tt.instanceGetFails, + instanceIsDeleted: tt.instanceState != nil && *tt.instanceState == INSTANCESTATUS_READY, + instanceId: instanceId, + instanceState: tt.instanceState, + }) - handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", instanceId, testRegion) + handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", instanceId, testRegion) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } @@ -313,36 +320,38 @@ func TestRestoreInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - backupId := "foo-bar" - - apiClient := newAPIMock(&mockSettings{ - backupId: backupId, - restoreState: tt.restoreState, - listRestoreJobsFails: tt.listRestoreJobsFails, - }) - - var wantRes *mongodbflex.ListRestoreJobsResponse - if tt.wantResp { - wantRes = &mongodbflex.ListRestoreJobsResponse{ - Items: []mongodbflex.RestoreInstanceStatus{ - { - Status: utils.Ptr(tt.restoreState), - BackupID: &backupId, + synctest.Test(t, func(t *testing.T) { + backupId := "foo-bar" + + apiClient := newAPIMock(&mockSettings{ + backupId: backupId, + restoreState: tt.restoreState, + listRestoreJobsFails: tt.listRestoreJobsFails, + }) + + var wantRes *mongodbflex.ListRestoreJobsResponse + if tt.wantResp { + wantRes = &mongodbflex.ListRestoreJobsResponse{ + Items: []mongodbflex.RestoreInstanceStatus{ + { + Status: utils.Ptr(tt.restoreState), + BackupID: &backupId, + }, }, - }, + } } - } - handler := RestoreInstanceWaitHandler(context.Background(), apiClient, "", "", backupId, testRegion) + handler := RestoreInstanceWaitHandler(context.Background(), apiClient, "", "", backupId, testRegion) - gotRes, err := handler.SetSleepBeforeWait(0).SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetSleepBeforeWait(0).SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } diff --git a/services/mongodbflex/wait/wait_test.go b/services/mongodbflex/wait/wait_test.go index 37e7803c6..58b597cee 100644 --- a/services/mongodbflex/wait/wait_test.go +++ b/services/mongodbflex/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -110,34 +111,36 @@ func TestCreateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := &apiClientInstanceMocked{ - instanceId: instanceId, - instanceState: tt.instanceState, - instanceGetFails: tt.instanceGetFails, - } - - var wantRes *mongodbflex.InstanceResponse - if tt.wantResp { - wantRes = &mongodbflex.InstanceResponse{ - Item: &mongodbflex.Instance{ - Id: &instanceId, - Status: utils.Ptr(tt.instanceState), - }, + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := &apiClientInstanceMocked{ + instanceId: instanceId, + instanceState: tt.instanceState, + instanceGetFails: tt.instanceGetFails, } - } - handler := CreateInstanceWaitHandler(context.Background(), apiClient, "", instanceId, testRegion) + var wantRes *mongodbflex.InstanceResponse + if tt.wantResp { + wantRes = &mongodbflex.InstanceResponse{ + Item: &mongodbflex.Instance{ + Id: &instanceId, + Status: utils.Ptr(tt.instanceState), + }, + } + } - gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) + handler := CreateInstanceWaitHandler(context.Background(), apiClient, "", instanceId, testRegion) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) + + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -187,34 +190,36 @@ func TestUpdateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := &apiClientInstanceMocked{ - instanceId: instanceId, - instanceState: tt.instanceState, - instanceGetFails: tt.instanceGetFails, - } - - var wantRes *mongodbflex.InstanceResponse - if tt.wantResp { - wantRes = &mongodbflex.InstanceResponse{ - Item: &mongodbflex.Instance{ - Id: &instanceId, - Status: utils.Ptr(tt.instanceState), - }, + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := &apiClientInstanceMocked{ + instanceId: instanceId, + instanceState: tt.instanceState, + instanceGetFails: tt.instanceGetFails, + } + + var wantRes *mongodbflex.InstanceResponse + if tt.wantResp { + wantRes = &mongodbflex.InstanceResponse{ + Item: &mongodbflex.Instance{ + Id: &instanceId, + Status: utils.Ptr(tt.instanceState), + }, + } } - } - handler := UpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId, testRegion) + handler := UpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId, testRegion) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -246,22 +251,24 @@ func TestDeleteInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := &apiClientInstanceMocked{ - instanceGetFails: tt.instanceGetFails, - instanceIsDeleted: tt.instanceState == mongodbflex.INSTANCESTATUS_READY, - instanceId: instanceId, - instanceState: tt.instanceState, - } + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := &apiClientInstanceMocked{ + instanceGetFails: tt.instanceGetFails, + instanceIsDeleted: tt.instanceState == mongodbflex.INSTANCESTATUS_READY, + instanceId: instanceId, + instanceState: tt.instanceState, + } - handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", instanceId, testRegion) + handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", instanceId, testRegion) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } @@ -311,36 +318,38 @@ func TestRestoreInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - backupId := "foo-bar" - - apiClient := &apiClientInstanceMocked{ - backupId: backupId, - restoreState: tt.restoreState, - listRestoreJobsFails: tt.listRestoreJobsFails, - } - - var wantRes *mongodbflex.ListRestoreJobsResponse - if tt.wantResp { - wantRes = &mongodbflex.ListRestoreJobsResponse{ - Items: &[]mongodbflex.RestoreInstanceStatus{ - { - Status: utils.Ptr(tt.restoreState), - BackupID: &backupId, + synctest.Test(t, func(t *testing.T) { + backupId := "foo-bar" + + apiClient := &apiClientInstanceMocked{ + backupId: backupId, + restoreState: tt.restoreState, + listRestoreJobsFails: tt.listRestoreJobsFails, + } + + var wantRes *mongodbflex.ListRestoreJobsResponse + if tt.wantResp { + wantRes = &mongodbflex.ListRestoreJobsResponse{ + Items: &[]mongodbflex.RestoreInstanceStatus{ + { + Status: utils.Ptr(tt.restoreState), + BackupID: &backupId, + }, }, - }, + } } - } - handler := RestoreInstanceWaitHandler(context.Background(), apiClient, "", "", backupId, testRegion) + handler := RestoreInstanceWaitHandler(context.Background(), apiClient, "", "", backupId, testRegion) - gotRes, err := handler.SetSleepBeforeWait(0).SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetSleepBeforeWait(0).SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } diff --git a/services/objectstorage/v2api/wait/wait_test.go b/services/objectstorage/v2api/wait/wait_test.go index 3930cd39a..784193323 100644 --- a/services/objectstorage/v2api/wait/wait_test.go +++ b/services/objectstorage/v2api/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -59,25 +60,27 @@ func TestCreateBucketWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newAPIMock(&mockSettings{ - bucketGetFails: tt.bucketGetFails, - }) - - var wantRes *objectstorage.GetBucketResponse - if tt.wantResp { - wantRes = &objectstorage.GetBucketResponse{} - } + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(&mockSettings{ + bucketGetFails: tt.bucketGetFails, + }) + + var wantRes *objectstorage.GetBucketResponse + if tt.wantResp { + wantRes = &objectstorage.GetBucketResponse{} + } - handler := CreateBucketWaitHandler(context.Background(), apiClient, "", "", "") + handler := CreateBucketWaitHandler(context.Background(), apiClient, "", "", "") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -101,18 +104,20 @@ func TestDeleteBucketWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newAPIMock(&mockSettings{ - bucketIsDeleted: true, - bucketGetFails: tt.bucketGetFails, - }) + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(&mockSettings{ + bucketIsDeleted: true, + bucketGetFails: tt.bucketGetFails, + }) - handler := DeleteBucketWaitHandler(context.Background(), apiClient, "", "", "") + handler := DeleteBucketWaitHandler(context.Background(), apiClient, "", "", "") - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } diff --git a/services/objectstorage/wait/wait_test.go b/services/objectstorage/wait/wait_test.go index c0b87f2d4..1d36c1f45 100644 --- a/services/objectstorage/wait/wait_test.go +++ b/services/objectstorage/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -55,25 +56,27 @@ func TestCreateBucketWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientBucketMocked{ - bucketGetFails: tt.bucketGetFails, - } - - var wantRes *objectstorage.GetBucketResponse - if tt.wantResp { - wantRes = &objectstorage.GetBucketResponse{} - } - - handler := CreateBucketWaitHandler(context.Background(), apiClient, "", "", "") - - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientBucketMocked{ + bucketGetFails: tt.bucketGetFails, + } + + var wantRes *objectstorage.GetBucketResponse + if tt.wantResp { + wantRes = &objectstorage.GetBucketResponse{} + } + + handler := CreateBucketWaitHandler(context.Background(), apiClient, "", "", "") + + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -97,18 +100,20 @@ func TestDeleteBucketWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientBucketMocked{ - bucketIsDeleted: true, - bucketGetFails: tt.bucketGetFails, - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientBucketMocked{ + bucketIsDeleted: true, + bucketGetFails: tt.bucketGetFails, + } - handler := DeleteBucketWaitHandler(context.Background(), apiClient, "", "", "") + handler := DeleteBucketWaitHandler(context.Background(), apiClient, "", "", "") - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } diff --git a/services/observability/v1api/wait/wait_test.go b/services/observability/v1api/wait/wait_test.go index a3c7f970d..8eef39fff 100644 --- a/services/observability/v1api/wait/wait_test.go +++ b/services/observability/v1api/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -93,29 +94,31 @@ func TestCreateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newAPIMock(&mockSettings{ - getFails: tt.getFails, - resourceState: tt.resourceState, - }) - - var wantRes *observability.GetInstanceResponse - if tt.wantResp { - wantRes = &observability.GetInstanceResponse{ - Id: "iid", - Status: tt.resourceState, + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(&mockSettings{ + getFails: tt.getFails, + resourceState: tt.resourceState, + }) + + var wantRes *observability.GetInstanceResponse + if tt.wantResp { + wantRes = &observability.GetInstanceResponse{ + Id: "iid", + Status: tt.resourceState, + } } - } - handler := CreateInstanceWaitHandler(context.Background(), apiClient, "iid", "pid") + handler := CreateInstanceWaitHandler(context.Background(), apiClient, "iid", "pid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes, cmpopts.IgnoreUnexported(observability.NullableString{})) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes, cmpopts.IgnoreUnexported(observability.NullableString{})) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -159,29 +162,31 @@ func TestUpdateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newAPIMock(&mockSettings{ - getFails: tt.getFails, - resourceState: tt.resourceState, - }) - - var wantRes *observability.GetInstanceResponse - if tt.wantResp { - wantRes = &observability.GetInstanceResponse{ - Status: tt.resourceState, - Id: "iid", + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(&mockSettings{ + getFails: tt.getFails, + resourceState: tt.resourceState, + }) + + var wantRes *observability.GetInstanceResponse + if tt.wantResp { + wantRes = &observability.GetInstanceResponse{ + Status: tt.resourceState, + Id: "iid", + } } - } - handler := UpdateInstanceWaitHandler(context.Background(), apiClient, "iid", "pid") + handler := UpdateInstanceWaitHandler(context.Background(), apiClient, "iid", "pid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes, cmpopts.IgnoreUnexported(observability.NullableString{})) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes, cmpopts.IgnoreUnexported(observability.NullableString{})) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -225,29 +230,31 @@ func TestDeleteInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newAPIMock(&mockSettings{ - getFails: tt.getFails, - resourceState: tt.resourceState, - }) - - var wantRes *observability.GetInstanceResponse - if tt.wantResp { - wantRes = &observability.GetInstanceResponse{ - Status: tt.resourceState, - Id: "iid", + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(&mockSettings{ + getFails: tt.getFails, + resourceState: tt.resourceState, + }) + + var wantRes *observability.GetInstanceResponse + if tt.wantResp { + wantRes = &observability.GetInstanceResponse{ + Status: tt.resourceState, + Id: "iid", + } } - } - handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "iid", "pid") + handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "iid", "pid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes, cmpopts.IgnoreUnexported(observability.NullableString{})) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes, cmpopts.IgnoreUnexported(observability.NullableString{})) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -295,28 +302,30 @@ func TestCreateScrapeConfigWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newAPIMock(&mockSettings{ - getFails: tt.getFails, - jobs: tt.jobs, - }) - - var wantRes *observability.ListScrapeConfigsResponse - if tt.wantResp { - wantRes = &observability.ListScrapeConfigsResponse{ - Data: tt.jobs, + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(&mockSettings{ + getFails: tt.getFails, + jobs: tt.jobs, + }) + + var wantRes *observability.ListScrapeConfigsResponse + if tt.wantResp { + wantRes = &observability.ListScrapeConfigsResponse{ + Data: tt.jobs, + } } - } - handler := CreateScrapeConfigWaitHandler(context.Background(), apiClient, "", "job", "") + handler := CreateScrapeConfigWaitHandler(context.Background(), apiClient, "", "job", "") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes, cmpopts.IgnoreUnexported(observability.NullableString{})) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes, cmpopts.IgnoreUnexported(observability.NullableString{})) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -361,28 +370,30 @@ func TestDeleteScrapeConfigWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newAPIMock(&mockSettings{ - getFails: tt.getFails, - jobs: tt.jobs, - }) - - var wantRes *observability.ListScrapeConfigsResponse - if tt.wantResp { - wantRes = &observability.ListScrapeConfigsResponse{ - Data: tt.jobs, + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(&mockSettings{ + getFails: tt.getFails, + jobs: tt.jobs, + }) + + var wantRes *observability.ListScrapeConfigsResponse + if tt.wantResp { + wantRes = &observability.ListScrapeConfigsResponse{ + Data: tt.jobs, + } } - } - handler := DeleteScrapeConfigWaitHandler(context.Background(), apiClient, "", "job", "") + handler := DeleteScrapeConfigWaitHandler(context.Background(), apiClient, "", "job", "") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes, cmpopts.IgnoreUnexported(observability.NullableString{})) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes, cmpopts.IgnoreUnexported(observability.NullableString{})) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } diff --git a/services/observability/wait/wait_test.go b/services/observability/wait/wait_test.go index aa0fba0bb..c0507a996 100644 --- a/services/observability/wait/wait_test.go +++ b/services/observability/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -90,29 +91,31 @@ func TestCreateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getFails: tt.getFails, - resourceState: tt.resourceState, - } - - var wantRes *observability.GetInstanceResponse - if tt.wantResp { - wantRes = &observability.GetInstanceResponse{ - Id: utils.Ptr("iid"), - Status: tt.resourceState, + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getFails: tt.getFails, + resourceState: tt.resourceState, } - } - handler := CreateInstanceWaitHandler(context.Background(), apiClient, "iid", "pid") + var wantRes *observability.GetInstanceResponse + if tt.wantResp { + wantRes = &observability.GetInstanceResponse{ + Id: utils.Ptr("iid"), + Status: tt.resourceState, + } + } + + handler := CreateInstanceWaitHandler(context.Background(), apiClient, "iid", "pid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes, cmpopts.IgnoreUnexported(observability.NullableString{})) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes, cmpopts.IgnoreUnexported(observability.NullableString{})) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -156,29 +159,31 @@ func TestUpdateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getFails: tt.getFails, - resourceState: tt.resourceState, - } - - var wantRes *observability.GetInstanceResponse - if tt.wantResp { - wantRes = &observability.GetInstanceResponse{ - Status: tt.resourceState, - Id: utils.Ptr("iid"), + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getFails: tt.getFails, + resourceState: tt.resourceState, + } + + var wantRes *observability.GetInstanceResponse + if tt.wantResp { + wantRes = &observability.GetInstanceResponse{ + Status: tt.resourceState, + Id: utils.Ptr("iid"), + } } - } - handler := UpdateInstanceWaitHandler(context.Background(), apiClient, "iid", "pid") + handler := UpdateInstanceWaitHandler(context.Background(), apiClient, "iid", "pid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes, cmpopts.IgnoreUnexported(observability.NullableString{})) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes, cmpopts.IgnoreUnexported(observability.NullableString{})) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -222,29 +227,31 @@ func TestDeleteInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getFails: tt.getFails, - resourceState: tt.resourceState, - } - - var wantRes *observability.GetInstanceResponse - if tt.wantResp { - wantRes = &observability.GetInstanceResponse{ - Status: tt.resourceState, - Id: utils.Ptr("iid"), + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getFails: tt.getFails, + resourceState: tt.resourceState, + } + + var wantRes *observability.GetInstanceResponse + if tt.wantResp { + wantRes = &observability.GetInstanceResponse{ + Status: tt.resourceState, + Id: utils.Ptr("iid"), + } } - } - handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "iid", "pid") + handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "iid", "pid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes, cmpopts.IgnoreUnexported(observability.NullableString{})) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes, cmpopts.IgnoreUnexported(observability.NullableString{})) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -281,28 +288,30 @@ func TestCreateScrapeConfigWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getFails: tt.getFails, - jobs: tt.jobs, - } - - var wantRes *observability.ListScrapeConfigsResponse - if tt.wantResp { - wantRes = &observability.ListScrapeConfigsResponse{ - Data: utils.Ptr(tt.jobs), + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getFails: tt.getFails, + jobs: tt.jobs, } - } - handler := CreateScrapeConfigWaitHandler(context.Background(), apiClient, "", "job", "") + var wantRes *observability.ListScrapeConfigsResponse + if tt.wantResp { + wantRes = &observability.ListScrapeConfigsResponse{ + Data: utils.Ptr(tt.jobs), + } + } - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + handler := CreateScrapeConfigWaitHandler(context.Background(), apiClient, "", "job", "") - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes, cmpopts.IgnoreUnexported(observability.NullableString{})) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes, cmpopts.IgnoreUnexported(observability.NullableString{})) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -339,28 +348,30 @@ func TestDeleteScrapeConfigWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getFails: tt.getFails, - jobs: tt.jobs, - } - - var wantRes *observability.ListScrapeConfigsResponse - if tt.wantResp { - wantRes = &observability.ListScrapeConfigsResponse{ - Data: utils.Ptr(tt.jobs), + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getFails: tt.getFails, + jobs: tt.jobs, + } + + var wantRes *observability.ListScrapeConfigsResponse + if tt.wantResp { + wantRes = &observability.ListScrapeConfigsResponse{ + Data: utils.Ptr(tt.jobs), + } } - } - handler := DeleteScrapeConfigWaitHandler(context.Background(), apiClient, "", "job", "") + handler := DeleteScrapeConfigWaitHandler(context.Background(), apiClient, "", "job", "") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes, cmpopts.IgnoreUnexported(observability.NullableString{})) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes, cmpopts.IgnoreUnexported(observability.NullableString{})) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } diff --git a/services/opensearch/v1api/wait/wait_test.go b/services/opensearch/v1api/wait/wait_test.go index 34c064454..b2c675830 100644 --- a/services/opensearch/v1api/wait/wait_test.go +++ b/services/opensearch/v1api/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -114,33 +115,35 @@ func TestCreateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := newAPIMock(&mockSettings{ - instanceGetFails: tt.getFails, - instanceResourceId: instanceId, - instanceResourceState: tt.resourceState, - }) - - var wantRes *opensearch.Instance - if tt.wantResp { - wantRes = &opensearch.Instance{ - InstanceId: &instanceId, - Status: tt.resourceState, + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := newAPIMock(&mockSettings{ + instanceGetFails: tt.getFails, + instanceResourceId: instanceId, + instanceResourceState: tt.resourceState, + }) + + var wantRes *opensearch.Instance + if tt.wantResp { + wantRes = &opensearch.Instance{ + InstanceId: &instanceId, + Status: tt.resourceState, + } } - } - handler := CreateInstanceWaitHandler(context.Background(), apiClient, "pid", instanceId) + handler := CreateInstanceWaitHandler(context.Background(), apiClient, "pid", instanceId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - diff := cmp.Diff(gotRes, wantRes) - if diff != "" { - t.Fatalf("handler gotRes = %+v\n want %+v\n diff = %s", gotRes, wantRes, diff) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + diff := cmp.Diff(gotRes, wantRes) + if diff != "" { + t.Fatalf("handler gotRes = %+v\n want %+v\n diff = %s", gotRes, wantRes, diff) + } + }) }) } } @@ -183,32 +186,34 @@ func TestUpdateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := newAPIMock(&mockSettings{ - instanceGetFails: tt.getFails, - instanceResourceId: instanceId, - instanceResourceState: tt.resourceState, - }) - - var wantRes *opensearch.Instance - if tt.wantResp { - wantRes = &opensearch.Instance{ - InstanceId: &instanceId, - Status: tt.resourceState, + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := newAPIMock(&mockSettings{ + instanceGetFails: tt.getFails, + instanceResourceId: instanceId, + instanceResourceState: tt.resourceState, + }) + + var wantRes *opensearch.Instance + if tt.wantResp { + wantRes = &opensearch.Instance{ + InstanceId: &instanceId, + Status: tt.resourceState, + } } - } - handler := PartialUpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId) + handler := PartialUpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -253,24 +258,26 @@ func TestDeleteInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := newAPIMock(&mockSettings{ - instanceGetFails: tt.getFails, - instanceDeletionSucceedsWithErrors: tt.deleteSucceeedsWithErrors, - instanceResourceId: instanceId, - instanceResourceOperation: INSTANCELASTOPERATIONTYPE_DELETE, - instanceResourceDescription: tt.resourceDescription, - instanceResourceState: tt.resourceState, - }) + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" - handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", instanceId) + apiClient := newAPIMock(&mockSettings{ + instanceGetFails: tt.getFails, + instanceDeletionSucceedsWithErrors: tt.deleteSucceeedsWithErrors, + instanceResourceId: instanceId, + instanceResourceOperation: INSTANCELASTOPERATIONTYPE_DELETE, + instanceResourceDescription: tt.resourceDescription, + instanceResourceState: tt.resourceState, + }) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", instanceId) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } @@ -306,31 +313,33 @@ func TestCreateCredentialsWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - credentialsId := "foo-bar" - - apiClient := newAPIMock(&mockSettings{ - credentialGetFails: tt.getFails, - credentialResourceId: credentialsId, - credentialOperationSucceeds: tt.operationSucceeds, - }) - - var wantRes *opensearch.CredentialsResponse - if tt.wantResp { - wantRes = &opensearch.CredentialsResponse{ - Id: credentialsId, + synctest.Test(t, func(t *testing.T) { + credentialsId := "foo-bar" + + apiClient := newAPIMock(&mockSettings{ + credentialGetFails: tt.getFails, + credentialResourceId: credentialsId, + credentialOperationSucceeds: tt.operationSucceeds, + }) + + var wantRes *opensearch.CredentialsResponse + if tt.wantResp { + wantRes = &opensearch.CredentialsResponse{ + Id: credentialsId, + } } - } - handler := CreateCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) + handler := CreateCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -363,22 +372,24 @@ func TestDeleteCredentialsWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - credentialsId := "foo-bar" + synctest.Test(t, func(t *testing.T) { + credentialsId := "foo-bar" - apiClient := newAPIMock(&mockSettings{ - credentialGetFails: tt.getFails, - credentialResourceId: credentialsId, - credentialOperationSucceeds: true, - credentialDeletionSucceeds: tt.deletionSucceeds, - }) + apiClient := newAPIMock(&mockSettings{ + credentialGetFails: tt.getFails, + credentialResourceId: credentialsId, + credentialOperationSucceeds: true, + credentialDeletionSucceeds: tt.deletionSucceeds, + }) - handler := DeleteCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) + handler := DeleteCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } diff --git a/services/opensearch/wait/wait_test.go b/services/opensearch/wait/wait_test.go index a1234d22f..4f6fa4206 100644 --- a/services/opensearch/wait/wait_test.go +++ b/services/opensearch/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -114,33 +115,35 @@ func TestCreateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := &apiClientInstanceMocked{ - getFails: tt.getFails, - resourceId: instanceId, - resourceState: tt.resourceState, - } - - var wantRes *opensearch.Instance - if tt.wantResp { - wantRes = &opensearch.Instance{ - InstanceId: &instanceId, - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := &apiClientInstanceMocked{ + getFails: tt.getFails, + resourceId: instanceId, + resourceState: tt.resourceState, + } + + var wantRes *opensearch.Instance + if tt.wantResp { + wantRes = &opensearch.Instance{ + InstanceId: &instanceId, + Status: utils.Ptr(tt.resourceState), + } } - } - handler := CreateInstanceWaitHandler(context.Background(), apiClient, "pid", instanceId) + handler := CreateInstanceWaitHandler(context.Background(), apiClient, "pid", instanceId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - diff := cmp.Diff(gotRes, wantRes) - if diff != "" { - t.Fatalf("handler gotRes = %+v\n want %+v\n diff = %s", gotRes, wantRes, diff) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + diff := cmp.Diff(gotRes, wantRes) + if diff != "" { + t.Fatalf("handler gotRes = %+v\n want %+v\n diff = %s", gotRes, wantRes, diff) + } + }) }) } } @@ -183,32 +186,34 @@ func TestUpdateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := &apiClientInstanceMocked{ - getFails: tt.getFails, - resourceId: instanceId, - resourceState: tt.resourceState, - } - - var wantRes *opensearch.Instance - if tt.wantResp { - wantRes = &opensearch.Instance{ - InstanceId: &instanceId, - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := &apiClientInstanceMocked{ + getFails: tt.getFails, + resourceId: instanceId, + resourceState: tt.resourceState, } - } - handler := PartialUpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId) + var wantRes *opensearch.Instance + if tt.wantResp { + wantRes = &opensearch.Instance{ + InstanceId: &instanceId, + Status: utils.Ptr(tt.resourceState), + } + } + + handler := PartialUpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -253,24 +258,26 @@ func TestDeleteInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := &apiClientInstanceMocked{ - getFails: tt.getFails, - deletionSucceedsWithErrors: tt.deleteSucceeedsWithErrors, - resourceId: instanceId, - resourceOperation: utils.Ptr(opensearch.INSTANCELASTOPERATIONTYPE_DELETE), - resourceDescription: tt.resourceDescription, - resourceState: tt.resourceState, - } + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := &apiClientInstanceMocked{ + getFails: tt.getFails, + deletionSucceedsWithErrors: tt.deleteSucceeedsWithErrors, + resourceId: instanceId, + resourceOperation: utils.Ptr(opensearch.INSTANCELASTOPERATIONTYPE_DELETE), + resourceDescription: tt.resourceDescription, + resourceState: tt.resourceState, + } - handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", instanceId) + handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", instanceId) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } @@ -306,31 +313,33 @@ func TestCreateCredentialsWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - credentialsId := "foo-bar" - - apiClient := &apiClientCredentialsMocked{ - getFails: tt.getFails, - resourceId: credentialsId, - operationSucceeds: tt.operationSucceeds, - } - - var wantRes *opensearch.CredentialsResponse - if tt.wantResp { - wantRes = &opensearch.CredentialsResponse{ - Id: &credentialsId, + synctest.Test(t, func(t *testing.T) { + credentialsId := "foo-bar" + + apiClient := &apiClientCredentialsMocked{ + getFails: tt.getFails, + resourceId: credentialsId, + operationSucceeds: tt.operationSucceeds, + } + + var wantRes *opensearch.CredentialsResponse + if tt.wantResp { + wantRes = &opensearch.CredentialsResponse{ + Id: &credentialsId, + } } - } - handler := CreateCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) + handler := CreateCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -363,22 +372,24 @@ func TestDeleteCredentialsWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - credentialsId := "foo-bar" - - apiClient := &apiClientCredentialsMocked{ - getFails: tt.getFails, - resourceId: credentialsId, - operationSucceeds: true, - deletionSucceeds: tt.deletionSucceeds, - } + synctest.Test(t, func(t *testing.T) { + credentialsId := "foo-bar" + + apiClient := &apiClientCredentialsMocked{ + getFails: tt.getFails, + resourceId: credentialsId, + operationSucceeds: true, + deletionSucceeds: tt.deletionSucceeds, + } - handler := DeleteCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) + handler := DeleteCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } diff --git a/services/postgresflex/v2api/wait/wait_test.go b/services/postgresflex/v2api/wait/wait_test.go index 7b9e4db09..ddd2230ee 100644 --- a/services/postgresflex/v2api/wait/wait_test.go +++ b/services/postgresflex/v2api/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -145,35 +146,37 @@ func TestCreateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := newAPIMock(&mockSettings{ - instanceId: instanceId, - instanceState: tt.instanceState, - instanceGetFails: tt.instanceGetFails, - usersGetErrorStatus: tt.usersGetErrorStatus, - }) - - var wantRes *postgresflex.InstanceResponse - if tt.wantResp { - wantRes = &postgresflex.InstanceResponse{ - Item: &postgresflex.Instance{ - Id: &instanceId, - Status: utils.Ptr(tt.instanceState), - }, + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := newAPIMock(&mockSettings{ + instanceId: instanceId, + instanceState: tt.instanceState, + instanceGetFails: tt.instanceGetFails, + usersGetErrorStatus: tt.usersGetErrorStatus, + }) + + var wantRes *postgresflex.InstanceResponse + if tt.wantResp { + wantRes = &postgresflex.InstanceResponse{ + Item: &postgresflex.Instance{ + Id: &instanceId, + Status: utils.Ptr(tt.instanceState), + }, + } } - } - handler := CreateInstanceWaitHandler(context.Background(), apiClient, "", "", instanceId) + handler := CreateInstanceWaitHandler(context.Background(), apiClient, "", "", instanceId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -223,34 +226,36 @@ func TestUpdateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := newAPIMock(&mockSettings{ - instanceId: instanceId, - instanceState: tt.instanceState, - instanceGetFails: tt.instanceGetFails, - }) - - var wantRes *postgresflex.InstanceResponse - if tt.wantResp { - wantRes = &postgresflex.InstanceResponse{ - Item: &postgresflex.Instance{ - Id: &instanceId, - Status: utils.Ptr(tt.instanceState), - }, + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := newAPIMock(&mockSettings{ + instanceId: instanceId, + instanceState: tt.instanceState, + instanceGetFails: tt.instanceGetFails, + }) + + var wantRes *postgresflex.InstanceResponse + if tt.wantResp { + wantRes = &postgresflex.InstanceResponse{ + Item: &postgresflex.Instance{ + Id: &instanceId, + Status: utils.Ptr(tt.instanceState), + }, + } } - } - handler := PartialUpdateInstanceWaitHandler(context.Background(), apiClient, "", "", instanceId) + handler := PartialUpdateInstanceWaitHandler(context.Background(), apiClient, "", "", instanceId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -282,21 +287,23 @@ func TestDeleteInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" - apiClient := newAPIMock(&mockSettings{ - instanceGetFails: tt.instanceGetFails, - instanceId: instanceId, - instanceState: tt.instanceState, - }) + apiClient := newAPIMock(&mockSettings{ + instanceGetFails: tt.instanceGetFails, + instanceId: instanceId, + instanceState: tt.instanceState, + }) - handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", "", instanceId) + handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", "", instanceId) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } @@ -328,22 +335,24 @@ func TestForceDeleteInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" - apiClient := newAPIMock(&mockSettings{ - instanceGetFails: tt.instanceGetFails, - instanceIsForceDeleted: tt.instanceState == InstanceStateDeleted, - instanceId: instanceId, - instanceState: tt.instanceState, - }) + apiClient := newAPIMock(&mockSettings{ + instanceGetFails: tt.instanceGetFails, + instanceIsForceDeleted: tt.instanceState == InstanceStateDeleted, + instanceId: instanceId, + instanceState: tt.instanceState, + }) - handler := ForceDeleteInstanceWaitHandler(context.Background(), apiClient, "", "", instanceId) + handler := ForceDeleteInstanceWaitHandler(context.Background(), apiClient, "", "", instanceId) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } @@ -376,21 +385,23 @@ func TestDeleteUserWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - userId := "foo-bar" + synctest.Test(t, func(t *testing.T) { + userId := "foo-bar" - apiClient := newAPIMock(&mockSettings{ - userGetFails: tt.getFails, - userId: userId, - userIsDeleted: !tt.deleteFails, - }) + apiClient := newAPIMock(&mockSettings{ + userGetFails: tt.getFails, + userId: userId, + userIsDeleted: !tt.deleteFails, + }) - handler := DeleteUserWaitHandler(context.Background(), apiClient, "", "", "", userId) + handler := DeleteUserWaitHandler(context.Background(), apiClient, "", "", "", userId) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } diff --git a/services/postgresflex/wait/wait_test.go b/services/postgresflex/wait/wait_test.go index d2c81bb53..64da700ad 100644 --- a/services/postgresflex/wait/wait_test.go +++ b/services/postgresflex/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -145,35 +146,37 @@ func TestCreateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := &apiClientInstanceMocked{ - instanceId: instanceId, - instanceState: tt.instanceState, - instanceGetFails: tt.instanceGetFails, - usersGetErrorStatus: tt.usersGetErrorStatus, - } - - var wantRes *postgresflex.InstanceResponse - if tt.wantResp { - wantRes = &postgresflex.InstanceResponse{ - Item: &postgresflex.Instance{ - Id: &instanceId, - Status: utils.Ptr(tt.instanceState), - }, + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := &apiClientInstanceMocked{ + instanceId: instanceId, + instanceState: tt.instanceState, + instanceGetFails: tt.instanceGetFails, + usersGetErrorStatus: tt.usersGetErrorStatus, } - } - handler := CreateInstanceWaitHandler(context.Background(), apiClient, "", "", instanceId) + var wantRes *postgresflex.InstanceResponse + if tt.wantResp { + wantRes = &postgresflex.InstanceResponse{ + Item: &postgresflex.Instance{ + Id: &instanceId, + Status: utils.Ptr(tt.instanceState), + }, + } + } + + handler := CreateInstanceWaitHandler(context.Background(), apiClient, "", "", instanceId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -223,34 +226,36 @@ func TestUpdateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := &apiClientInstanceMocked{ - instanceId: instanceId, - instanceState: tt.instanceState, - instanceGetFails: tt.instanceGetFails, - } - - var wantRes *postgresflex.InstanceResponse - if tt.wantResp { - wantRes = &postgresflex.InstanceResponse{ - Item: &postgresflex.Instance{ - Id: &instanceId, - Status: utils.Ptr(tt.instanceState), - }, + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := &apiClientInstanceMocked{ + instanceId: instanceId, + instanceState: tt.instanceState, + instanceGetFails: tt.instanceGetFails, + } + + var wantRes *postgresflex.InstanceResponse + if tt.wantResp { + wantRes = &postgresflex.InstanceResponse{ + Item: &postgresflex.Instance{ + Id: &instanceId, + Status: utils.Ptr(tt.instanceState), + }, + } } - } - handler := PartialUpdateInstanceWaitHandler(context.Background(), apiClient, "", "", instanceId) + handler := PartialUpdateInstanceWaitHandler(context.Background(), apiClient, "", "", instanceId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -282,21 +287,23 @@ func TestDeleteInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" - apiClient := &apiClientInstanceMocked{ - instanceGetFails: tt.instanceGetFails, - instanceId: instanceId, - instanceState: tt.instanceState, - } + apiClient := &apiClientInstanceMocked{ + instanceGetFails: tt.instanceGetFails, + instanceId: instanceId, + instanceState: tt.instanceState, + } - handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", "", instanceId) + handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", "", instanceId) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } @@ -328,22 +335,24 @@ func TestForceDeleteInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := &apiClientInstanceMocked{ - instanceGetFails: tt.instanceGetFails, - instanceIsForceDeleted: tt.instanceState == InstanceStateDeleted, - instanceId: instanceId, - instanceState: tt.instanceState, - } + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := &apiClientInstanceMocked{ + instanceGetFails: tt.instanceGetFails, + instanceIsForceDeleted: tt.instanceState == InstanceStateDeleted, + instanceId: instanceId, + instanceState: tt.instanceState, + } - handler := ForceDeleteInstanceWaitHandler(context.Background(), apiClient, "", "", instanceId) + handler := ForceDeleteInstanceWaitHandler(context.Background(), apiClient, "", "", instanceId) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } @@ -376,21 +385,23 @@ func TestDeleteUserWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - userId := "foo-bar" + synctest.Test(t, func(t *testing.T) { + userId := "foo-bar" - apiClient := &apiClientUserMocked{ - getFails: tt.getFails, - userId: userId, - isUserDeleted: !tt.deleteFails, - } + apiClient := &apiClientUserMocked{ + getFails: tt.getFails, + userId: userId, + isUserDeleted: !tt.deleteFails, + } - handler := DeleteUserWaitHandler(context.Background(), apiClient, "", "", "", userId) + handler := DeleteUserWaitHandler(context.Background(), apiClient, "", "", "", userId) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } diff --git a/services/rabbitmq/v1api/wait/wait_test.go b/services/rabbitmq/v1api/wait/wait_test.go index 076afc57d..7cd9a28bd 100644 --- a/services/rabbitmq/v1api/wait/wait_test.go +++ b/services/rabbitmq/v1api/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -113,33 +114,35 @@ func TestCreateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := newAPIMock(&mockSettings{ - instanceGetFails: tt.getFails, - instanceResourceId: instanceId, - instanceResourceState: tt.resourceState, - }) - - var wantRes *rabbitmq.Instance - if tt.wantResp { - wantRes = &rabbitmq.Instance{ - InstanceId: &instanceId, - Status: tt.resourceState, + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := newAPIMock(&mockSettings{ + instanceGetFails: tt.getFails, + instanceResourceId: instanceId, + instanceResourceState: tt.resourceState, + }) + + var wantRes *rabbitmq.Instance + if tt.wantResp { + wantRes = &rabbitmq.Instance{ + InstanceId: &instanceId, + Status: tt.resourceState, + } } - } - handler := CreateInstanceWaitHandler(context.Background(), apiClient, "pid", instanceId) + handler := CreateInstanceWaitHandler(context.Background(), apiClient, "pid", instanceId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - diff := cmp.Diff(gotRes, wantRes) - if diff != "" { - t.Fatalf("handler gotRes = %+v\n want %+v\n diff = %s", gotRes, wantRes, diff) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + diff := cmp.Diff(gotRes, wantRes) + if diff != "" { + t.Fatalf("handler gotRes = %+v\n want %+v\n diff = %s", gotRes, wantRes, diff) + } + }) }) } } @@ -182,32 +185,34 @@ func TestUpdateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := newAPIMock(&mockSettings{ - instanceGetFails: tt.getFails, - instanceResourceId: instanceId, - instanceResourceState: tt.resourceState, - }) - - var wantRes *rabbitmq.Instance - if tt.wantResp { - wantRes = &rabbitmq.Instance{ - InstanceId: &instanceId, - Status: tt.resourceState, + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := newAPIMock(&mockSettings{ + instanceGetFails: tt.getFails, + instanceResourceId: instanceId, + instanceResourceState: tt.resourceState, + }) + + var wantRes *rabbitmq.Instance + if tt.wantResp { + wantRes = &rabbitmq.Instance{ + InstanceId: &instanceId, + Status: tt.resourceState, + } } - } - handler := PartialUpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId) + handler := PartialUpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -252,24 +257,26 @@ func TestDeleteInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := newAPIMock(&mockSettings{ - instanceGetFails: tt.getFails, - instanceDeletionSucceedsWithErrors: tt.deleteSucceeedsWithErrors, - instanceResourceId: instanceId, - instanceResourceOperation: INSTANCELASTOPERATIONTYPE_DELETE, - instanceResourceDescription: tt.resourceDescription, - instanceResourceState: tt.resourceState, - }) + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" - handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", instanceId) + apiClient := newAPIMock(&mockSettings{ + instanceGetFails: tt.getFails, + instanceDeletionSucceedsWithErrors: tt.deleteSucceeedsWithErrors, + instanceResourceId: instanceId, + instanceResourceOperation: INSTANCELASTOPERATIONTYPE_DELETE, + instanceResourceDescription: tt.resourceDescription, + instanceResourceState: tt.resourceState, + }) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", instanceId) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } @@ -305,31 +312,33 @@ func TestCreateCredentialsWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - credentialsId := "foo-bar" - - apiClient := newAPIMock(&mockSettings{ - credentialGetFails: tt.getFails, - credentialResourceId: credentialsId, - credentialOperationSucceeds: tt.operationSucceeds, - }) - - var wantRes *rabbitmq.CredentialsResponse - if tt.wantResp { - wantRes = &rabbitmq.CredentialsResponse{ - Id: credentialsId, + synctest.Test(t, func(t *testing.T) { + credentialsId := "foo-bar" + + apiClient := newAPIMock(&mockSettings{ + credentialGetFails: tt.getFails, + credentialResourceId: credentialsId, + credentialOperationSucceeds: tt.operationSucceeds, + }) + + var wantRes *rabbitmq.CredentialsResponse + if tt.wantResp { + wantRes = &rabbitmq.CredentialsResponse{ + Id: credentialsId, + } } - } - handler := CreateCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) + handler := CreateCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -362,22 +371,24 @@ func TestDeleteCredentialsWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - credentialsId := "foo-bar" + synctest.Test(t, func(t *testing.T) { + credentialsId := "foo-bar" - apiClient := newAPIMock(&mockSettings{ - credentialGetFails: tt.getFails, - credentialResourceId: credentialsId, - credentialOperationSucceeds: true, - credentialDeletionSucceeds: tt.deletionSucceeds, - }) + apiClient := newAPIMock(&mockSettings{ + credentialGetFails: tt.getFails, + credentialResourceId: credentialsId, + credentialOperationSucceeds: true, + credentialDeletionSucceeds: tt.deletionSucceeds, + }) - handler := DeleteCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) + handler := DeleteCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } diff --git a/services/rabbitmq/wait/wait_test.go b/services/rabbitmq/wait/wait_test.go index 3b6564b9c..0ee2f0030 100644 --- a/services/rabbitmq/wait/wait_test.go +++ b/services/rabbitmq/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -114,33 +115,35 @@ func TestCreateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := &apiClientInstanceMocked{ - getFails: tt.getFails, - resourceId: instanceId, - resourceState: tt.resourceState, - } - - var wantRes *rabbitmq.Instance - if tt.wantResp { - wantRes = &rabbitmq.Instance{ - InstanceId: &instanceId, - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := &apiClientInstanceMocked{ + getFails: tt.getFails, + resourceId: instanceId, + resourceState: tt.resourceState, + } + + var wantRes *rabbitmq.Instance + if tt.wantResp { + wantRes = &rabbitmq.Instance{ + InstanceId: &instanceId, + Status: utils.Ptr(tt.resourceState), + } } - } - handler := CreateInstanceWaitHandler(context.Background(), apiClient, "pid", instanceId) + handler := CreateInstanceWaitHandler(context.Background(), apiClient, "pid", instanceId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - diff := cmp.Diff(gotRes, wantRes) - if diff != "" { - t.Fatalf("handler gotRes = %+v\n want %+v\n diff = %s", gotRes, wantRes, diff) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + diff := cmp.Diff(gotRes, wantRes) + if diff != "" { + t.Fatalf("handler gotRes = %+v\n want %+v\n diff = %s", gotRes, wantRes, diff) + } + }) }) } } @@ -183,32 +186,34 @@ func TestUpdateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := &apiClientInstanceMocked{ - getFails: tt.getFails, - resourceId: instanceId, - resourceState: tt.resourceState, - } - - var wantRes *rabbitmq.Instance - if tt.wantResp { - wantRes = &rabbitmq.Instance{ - InstanceId: &instanceId, - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := &apiClientInstanceMocked{ + getFails: tt.getFails, + resourceId: instanceId, + resourceState: tt.resourceState, } - } - handler := PartialUpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId) + var wantRes *rabbitmq.Instance + if tt.wantResp { + wantRes = &rabbitmq.Instance{ + InstanceId: &instanceId, + Status: utils.Ptr(tt.resourceState), + } + } + + handler := PartialUpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -253,24 +258,26 @@ func TestDeleteInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := &apiClientInstanceMocked{ - getFails: tt.getFails, - deletionSucceedsWithErrors: tt.deleteSucceeedsWithErrors, - resourceId: instanceId, - resourceOperation: utils.Ptr(rabbitmq.INSTANCELASTOPERATIONTYPE_DELETE), - resourceDescription: tt.resourceDescription, - resourceState: tt.resourceState, - } + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := &apiClientInstanceMocked{ + getFails: tt.getFails, + deletionSucceedsWithErrors: tt.deleteSucceeedsWithErrors, + resourceId: instanceId, + resourceOperation: utils.Ptr(rabbitmq.INSTANCELASTOPERATIONTYPE_DELETE), + resourceDescription: tt.resourceDescription, + resourceState: tt.resourceState, + } - handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", instanceId) + handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", instanceId) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } @@ -306,31 +313,33 @@ func TestCreateCredentialsWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - credentialsId := "foo-bar" - - apiClient := &apiClientCredentialsMocked{ - getFails: tt.getFails, - resourceId: credentialsId, - operationSucceeds: tt.operationSucceeds, - } - - var wantRes *rabbitmq.CredentialsResponse - if tt.wantResp { - wantRes = &rabbitmq.CredentialsResponse{ - Id: &credentialsId, + synctest.Test(t, func(t *testing.T) { + credentialsId := "foo-bar" + + apiClient := &apiClientCredentialsMocked{ + getFails: tt.getFails, + resourceId: credentialsId, + operationSucceeds: tt.operationSucceeds, + } + + var wantRes *rabbitmq.CredentialsResponse + if tt.wantResp { + wantRes = &rabbitmq.CredentialsResponse{ + Id: &credentialsId, + } } - } - handler := CreateCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) + handler := CreateCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -363,22 +372,24 @@ func TestDeleteCredentialsWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - credentialsId := "foo-bar" - - apiClient := &apiClientCredentialsMocked{ - getFails: tt.getFails, - resourceId: credentialsId, - operationSucceeds: true, - deletionSucceeds: tt.deletionSucceeds, - } + synctest.Test(t, func(t *testing.T) { + credentialsId := "foo-bar" + + apiClient := &apiClientCredentialsMocked{ + getFails: tt.getFails, + resourceId: credentialsId, + operationSucceeds: true, + deletionSucceeds: tt.deletionSucceeds, + } - handler := DeleteCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) + handler := DeleteCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } diff --git a/services/redis/v1api/wait/wait_test.go b/services/redis/v1api/wait/wait_test.go index 63729ec95..e71d036b1 100644 --- a/services/redis/v1api/wait/wait_test.go +++ b/services/redis/v1api/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -113,33 +114,35 @@ func TestCreateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := newAPIMock(&mockSettings{ - instanceGetFails: tt.getFails, - instanceResourceId: instanceId, - instanceResourceState: tt.resourceState, - }) - - var wantRes *redis.Instance - if tt.wantResp { - wantRes = &redis.Instance{ - InstanceId: &instanceId, - Status: tt.resourceState, + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := newAPIMock(&mockSettings{ + instanceGetFails: tt.getFails, + instanceResourceId: instanceId, + instanceResourceState: tt.resourceState, + }) + + var wantRes *redis.Instance + if tt.wantResp { + wantRes = &redis.Instance{ + InstanceId: &instanceId, + Status: tt.resourceState, + } } - } - handler := CreateInstanceWaitHandler(context.Background(), apiClient, "pid", instanceId) + handler := CreateInstanceWaitHandler(context.Background(), apiClient, "pid", instanceId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - diff := cmp.Diff(gotRes, wantRes) - if diff != "" { - t.Fatalf("handler gotRes = %+v\n want %+v\n diff = %s", gotRes, wantRes, diff) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + diff := cmp.Diff(gotRes, wantRes) + if diff != "" { + t.Fatalf("handler gotRes = %+v\n want %+v\n diff = %s", gotRes, wantRes, diff) + } + }) }) } } @@ -182,32 +185,34 @@ func TestUpdateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := newAPIMock(&mockSettings{ - instanceGetFails: tt.getFails, - instanceResourceId: instanceId, - instanceResourceState: tt.resourceState, - }) - - var wantRes *redis.Instance - if tt.wantResp { - wantRes = &redis.Instance{ - InstanceId: &instanceId, - Status: tt.resourceState, + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := newAPIMock(&mockSettings{ + instanceGetFails: tt.getFails, + instanceResourceId: instanceId, + instanceResourceState: tt.resourceState, + }) + + var wantRes *redis.Instance + if tt.wantResp { + wantRes = &redis.Instance{ + InstanceId: &instanceId, + Status: tt.resourceState, + } } - } - handler := PartialUpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId) + handler := PartialUpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -252,24 +257,26 @@ func TestDeleteInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := newAPIMock(&mockSettings{ - instanceGetFails: tt.getFails, - instanceDeletionSucceedsWithErrors: tt.deleteSucceeedsWithErrors, - instanceResourceId: instanceId, - instanceResourceOperation: INSTANCELASTOPERATIONTYPE_DELETE, - instanceResourceDescription: tt.resourceDescription, - instanceResourceState: tt.resourceState, - }) + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" - handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", instanceId) + apiClient := newAPIMock(&mockSettings{ + instanceGetFails: tt.getFails, + instanceDeletionSucceedsWithErrors: tt.deleteSucceeedsWithErrors, + instanceResourceId: instanceId, + instanceResourceOperation: INSTANCELASTOPERATIONTYPE_DELETE, + instanceResourceDescription: tt.resourceDescription, + instanceResourceState: tt.resourceState, + }) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", instanceId) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } @@ -305,31 +312,33 @@ func TestCreateCredentialsWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - credentialsId := "foo-bar" - - apiClient := newAPIMock(&mockSettings{ - credentialGetFails: tt.getFails, - credentialResourceId: credentialsId, - credentialOperationSucceeds: tt.operationSucceeds, - }) - - var wantRes *redis.CredentialsResponse - if tt.wantResp { - wantRes = &redis.CredentialsResponse{ - Id: credentialsId, + synctest.Test(t, func(t *testing.T) { + credentialsId := "foo-bar" + + apiClient := newAPIMock(&mockSettings{ + credentialGetFails: tt.getFails, + credentialResourceId: credentialsId, + credentialOperationSucceeds: tt.operationSucceeds, + }) + + var wantRes *redis.CredentialsResponse + if tt.wantResp { + wantRes = &redis.CredentialsResponse{ + Id: credentialsId, + } } - } - handler := CreateCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) + handler := CreateCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -362,22 +371,24 @@ func TestDeleteCredentialsWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - credentialsId := "foo-bar" + synctest.Test(t, func(t *testing.T) { + credentialsId := "foo-bar" - apiClient := newAPIMock(&mockSettings{ - credentialGetFails: tt.getFails, - credentialResourceId: credentialsId, - credentialOperationSucceeds: true, - credentialDeletionSucceeds: tt.deletionSucceeds, - }) + apiClient := newAPIMock(&mockSettings{ + credentialGetFails: tt.getFails, + credentialResourceId: credentialsId, + credentialOperationSucceeds: true, + credentialDeletionSucceeds: tt.deletionSucceeds, + }) - handler := DeleteCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) + handler := DeleteCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } diff --git a/services/redis/wait/wait_test.go b/services/redis/wait/wait_test.go index f93c9d1a9..05eb28b44 100644 --- a/services/redis/wait/wait_test.go +++ b/services/redis/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -114,33 +115,35 @@ func TestCreateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := &apiClientInstanceMocked{ - getFails: tt.getFails, - resourceId: instanceId, - resourceState: tt.resourceState, - } - - var wantRes *redis.Instance - if tt.wantResp { - wantRes = &redis.Instance{ - InstanceId: &instanceId, - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := &apiClientInstanceMocked{ + getFails: tt.getFails, + resourceId: instanceId, + resourceState: tt.resourceState, + } + + var wantRes *redis.Instance + if tt.wantResp { + wantRes = &redis.Instance{ + InstanceId: &instanceId, + Status: utils.Ptr(tt.resourceState), + } } - } - handler := CreateInstanceWaitHandler(context.Background(), apiClient, "pid", instanceId) + handler := CreateInstanceWaitHandler(context.Background(), apiClient, "pid", instanceId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - diff := cmp.Diff(gotRes, wantRes) - if diff != "" { - t.Fatalf("handler gotRes = %+v\n want %+v\n diff = %s", gotRes, wantRes, diff) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + diff := cmp.Diff(gotRes, wantRes) + if diff != "" { + t.Fatalf("handler gotRes = %+v\n want %+v\n diff = %s", gotRes, wantRes, diff) + } + }) }) } } @@ -183,32 +186,34 @@ func TestUpdateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := &apiClientInstanceMocked{ - getFails: tt.getFails, - resourceId: instanceId, - resourceState: tt.resourceState, - } - - var wantRes *redis.Instance - if tt.wantResp { - wantRes = &redis.Instance{ - InstanceId: &instanceId, - Status: utils.Ptr(tt.resourceState), + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := &apiClientInstanceMocked{ + getFails: tt.getFails, + resourceId: instanceId, + resourceState: tt.resourceState, } - } - handler := PartialUpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId) + var wantRes *redis.Instance + if tt.wantResp { + wantRes = &redis.Instance{ + InstanceId: &instanceId, + Status: utils.Ptr(tt.resourceState), + } + } + + handler := PartialUpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -253,24 +258,26 @@ func TestDeleteInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := &apiClientInstanceMocked{ - getFails: tt.getFails, - deletionSucceedsWithErrors: tt.deleteSucceeedsWithErrors, - resourceId: instanceId, - resourceOperation: utils.Ptr(redis.INSTANCELASTOPERATIONTYPE_DELETE), - resourceDescription: tt.resourceDescription, - resourceState: tt.resourceState, - } + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := &apiClientInstanceMocked{ + getFails: tt.getFails, + deletionSucceedsWithErrors: tt.deleteSucceeedsWithErrors, + resourceId: instanceId, + resourceOperation: utils.Ptr(redis.INSTANCELASTOPERATIONTYPE_DELETE), + resourceDescription: tt.resourceDescription, + resourceState: tt.resourceState, + } - handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", instanceId) + handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", instanceId) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } @@ -306,31 +313,33 @@ func TestCreateCredentialsWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - credentialsId := "foo-bar" - - apiClient := &apiClientCredentialsMocked{ - getFails: tt.getFails, - resourceId: credentialsId, - operationSucceeds: tt.operationSucceeds, - } - - var wantRes *redis.CredentialsResponse - if tt.wantResp { - wantRes = &redis.CredentialsResponse{ - Id: &credentialsId, + synctest.Test(t, func(t *testing.T) { + credentialsId := "foo-bar" + + apiClient := &apiClientCredentialsMocked{ + getFails: tt.getFails, + resourceId: credentialsId, + operationSucceeds: tt.operationSucceeds, + } + + var wantRes *redis.CredentialsResponse + if tt.wantResp { + wantRes = &redis.CredentialsResponse{ + Id: &credentialsId, + } } - } - handler := CreateCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) + handler := CreateCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -363,22 +372,24 @@ func TestDeleteCredentialsWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - credentialsId := "foo-bar" - - apiClient := &apiClientCredentialsMocked{ - getFails: tt.getFails, - resourceId: credentialsId, - operationSucceeds: true, - deletionSucceeds: tt.deletionSucceeds, - } + synctest.Test(t, func(t *testing.T) { + credentialsId := "foo-bar" + + apiClient := &apiClientCredentialsMocked{ + getFails: tt.getFails, + resourceId: credentialsId, + operationSucceeds: true, + deletionSucceeds: tt.deletionSucceeds, + } - handler := DeleteCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) + handler := DeleteCredentialsWaitHandler(context.Background(), apiClient, "", "", credentialsId) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } diff --git a/services/resourcemanager/v0api/wait/wait_test.go b/services/resourcemanager/v0api/wait/wait_test.go index 9548352c2..b7562f28c 100644 --- a/services/resourcemanager/v0api/wait/wait_test.go +++ b/services/resourcemanager/v0api/wait/wait_test.go @@ -4,7 +4,7 @@ import ( "context" "net/http" "testing" - "time" + "testing/synctest" "github.com/google/go-cmp/cmp" @@ -110,26 +110,28 @@ func TestCreateProjectWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newAPIMock(tt.mockSettings) - - var wantRes *resourcemanager.GetProjectResponse - if tt.wantResp { - wantRes = &resourcemanager.GetProjectResponse{ - LifecycleState: tt.wantProjectState, - ContainerId: "cid", + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(tt.mockSettings) + + var wantRes *resourcemanager.GetProjectResponse + if tt.wantResp { + wantRes = &resourcemanager.GetProjectResponse{ + LifecycleState: tt.wantProjectState, + ContainerId: "cid", + } } - } - handler := CreateProjectWaitHandler(context.Background(), apiClient, "cid") + handler := CreateProjectWaitHandler(context.Background(), apiClient, "cid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(0).SetThrottle(1).WaitWithContext(context.Background()) + gotRes, err := handler.WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -195,15 +197,17 @@ func TestDeleteProjectWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newAPIMock(tt.mockSettings) + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(tt.mockSettings) - handler := DeleteProjectWaitHandler(context.Background(), apiClient, "cid") + handler := DeleteProjectWaitHandler(context.Background(), apiClient, "cid") - _, err := handler.SetTimeout(10 * time.Millisecond).SetThrottle(1).WaitWithContext(context.Background()) + _, err := handler.WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } diff --git a/services/resourcemanager/wait/wait_test.go b/services/resourcemanager/wait/wait_test.go index 755cbf77e..8183a7fd3 100644 --- a/services/resourcemanager/wait/wait_test.go +++ b/services/resourcemanager/wait/wait_test.go @@ -4,6 +4,7 @@ import ( "context" "net/http" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -77,29 +78,31 @@ func TestCreateProjectWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getFails: tt.getFails, - projectState: tt.projectState, - } - - var wantRes *resourcemanager.GetProjectResponse - if tt.wantResp { - wantRes = &resourcemanager.GetProjectResponse{ - LifecycleState: utils.Ptr(tt.projectState), - ContainerId: utils.Ptr("cid"), + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getFails: tt.getFails, + projectState: tt.projectState, } - } - handler := CreateProjectWaitHandler(context.Background(), apiClient, "cid") + var wantRes *resourcemanager.GetProjectResponse + if tt.wantResp { + wantRes = &resourcemanager.GetProjectResponse{ + LifecycleState: utils.Ptr(tt.projectState), + ContainerId: utils.Ptr("cid"), + } + } + + handler := CreateProjectWaitHandler(context.Background(), apiClient, "cid") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetSleepBeforeWait(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -134,19 +137,21 @@ func TestDeleteProjectWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - getFails: tt.getFails, - getNotFound: tt.getNotFound, - projectState: tt.projectState, - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + getFails: tt.getFails, + getNotFound: tt.getNotFound, + projectState: tt.projectState, + } - handler := DeleteProjectWaitHandler(context.Background(), apiClient, "cid") + handler := DeleteProjectWaitHandler(context.Background(), apiClient, "cid") - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } diff --git a/services/scf/v1api/wait/wait_test.go b/services/scf/v1api/wait/wait_test.go index 87cf5f921..34ffd6828 100644 --- a/services/scf/v1api/wait/wait_test.go +++ b/services/scf/v1api/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/uuid" @@ -81,24 +82,26 @@ func TestDeleteOrganizationWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := newAPIMock(&mockSettings{ - projectId: PROJECT_ID, - instanceId: INSTANCE_ID, - getFails: tt.getFails, - errorCode: tt.errorCode, - returnInstance: tt.returnInstance, - getSCFResponse: tt.getOrgResponse, - }) + synctest.Test(t, func(t *testing.T) { + apiClient := newAPIMock(&mockSettings{ + projectId: PROJECT_ID, + instanceId: INSTANCE_ID, + getFails: tt.getFails, + errorCode: tt.errorCode, + returnInstance: tt.returnInstance, + getSCFResponse: tt.getOrgResponse, + }) - handler := DeleteOrganizationWaitHandler(context.Background(), apiClient, PROJECT_ID, REGION, INSTANCE_ID) - response, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + handler := DeleteOrganizationWaitHandler(context.Background(), apiClient, PROJECT_ID, REGION, INSTANCE_ID) + response, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if (response != nil) != tt.wantReturnedInstance { - t.Fatalf("handler gotRes = %v, want nil", response) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if (response != nil) != tt.wantReturnedInstance { + t.Fatalf("handler gotRes = %v, want nil", response) + } + }) }) } } diff --git a/services/scf/wait/wait_test.go b/services/scf/wait/wait_test.go index 072d4fa6c..4eae8b86e 100644 --- a/services/scf/wait/wait_test.go +++ b/services/scf/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/uuid" @@ -76,24 +77,26 @@ func TestDeleteOrganizationWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - apiClient := &apiClientMocked{ - projectId: PROJECT_ID, - instanceId: INSTANCE_ID, - getFails: tt.getFails, - errorCode: tt.errorCode, - returnInstance: tt.returnInstance, - getSCFResponse: tt.getOrgResponse, - } + synctest.Test(t, func(t *testing.T) { + apiClient := &apiClientMocked{ + projectId: PROJECT_ID, + instanceId: INSTANCE_ID, + getFails: tt.getFails, + errorCode: tt.errorCode, + returnInstance: tt.returnInstance, + getSCFResponse: tt.getOrgResponse, + } - handler := DeleteOrganizationWaitHandler(context.Background(), apiClient, apiClient.projectId, REGION, apiClient.instanceId) - response, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + handler := DeleteOrganizationWaitHandler(context.Background(), apiClient, apiClient.projectId, REGION, apiClient.instanceId) + response, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if (response != nil) != tt.wantReturnedInstance { - t.Fatalf("handler gotRes = %v, want nil", response) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if (response != nil) != tt.wantReturnedInstance { + t.Fatalf("handler gotRes = %v, want nil", response) + } + }) }) } } diff --git a/services/serviceenablement/v2api/wait/wait_test.go b/services/serviceenablement/v2api/wait/wait_test.go index 77981a572..75e998ae1 100644 --- a/services/serviceenablement/v2api/wait/wait_test.go +++ b/services/serviceenablement/v2api/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -81,37 +82,39 @@ func TestEnableServiceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - serviceId := "serviceId" - - apiClient := newAPIMock(&mockSettings{ - serviceId: serviceId, - serviceState: tt.serviceState, - getServiceFails: tt.getServiceFails, - }) - - var wantRes *serviceenablement.ServiceStatus - if tt.wantResp { - wantRes = &serviceenablement.ServiceStatus{ - ServiceId: &serviceId, - State: tt.serviceState, + synctest.Test(t, func(t *testing.T) { + serviceId := "serviceId" + + apiClient := newAPIMock(&mockSettings{ + serviceId: serviceId, + serviceState: tt.serviceState, + getServiceFails: tt.getServiceFails, + }) + + var wantRes *serviceenablement.ServiceStatus + if tt.wantResp { + wantRes = &serviceenablement.ServiceStatus{ + ServiceId: &serviceId, + State: tt.serviceState, + } } - } - ctx := context.Background() + ctx := context.Background() - handler := EnableServiceWaitHandler(ctx, apiClient, "eu01", "projectId", serviceId) + handler := EnableServiceWaitHandler(ctx, apiClient, "eu01", "projectId", serviceId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(0).WaitWithContext(ctx) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(0).WaitWithContext(ctx) - if err != nil { - if !tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + if err != nil { + if !tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + return } - return - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }, ) } @@ -163,37 +166,39 @@ func TestDisableServiceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - serviceId := "serviceId" - - apiClient := newAPIMock(&mockSettings{ - serviceId: serviceId, - serviceState: tt.serviceState, - getServiceFails: tt.getServiceFails, - }) - - var wantRes *serviceenablement.ServiceStatus - if tt.wantResp { - wantRes = &serviceenablement.ServiceStatus{ - ServiceId: &serviceId, - State: tt.serviceState, + synctest.Test(t, func(t *testing.T) { + serviceId := "serviceId" + + apiClient := newAPIMock(&mockSettings{ + serviceId: serviceId, + serviceState: tt.serviceState, + getServiceFails: tt.getServiceFails, + }) + + var wantRes *serviceenablement.ServiceStatus + if tt.wantResp { + wantRes = &serviceenablement.ServiceStatus{ + ServiceId: &serviceId, + State: tt.serviceState, + } } - } - ctx := context.Background() + ctx := context.Background() - handler := DisableServiceWaitHandler(ctx, apiClient, "eu01", "projectId", serviceId) + handler := DisableServiceWaitHandler(ctx, apiClient, "eu01", "projectId", serviceId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(0).WaitWithContext(ctx) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(0).WaitWithContext(ctx) - if err != nil { - if !tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + if err != nil { + if !tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + return } - return - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }, ) } diff --git a/services/serviceenablement/wait/wait_test.go b/services/serviceenablement/wait/wait_test.go index 759880218..fb4ed07a9 100644 --- a/services/serviceenablement/wait/wait_test.go +++ b/services/serviceenablement/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -78,37 +79,39 @@ func TestEnableServiceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - serviceId := "serviceId" - - apiClient := &apiClientServiceMocked{ - serviceId: serviceId, - serviceState: tt.serviceState, - getServiceFails: tt.getServiceFails, - } - - var wantRes *serviceenablement.ServiceStatus - if tt.wantResp { - wantRes = &serviceenablement.ServiceStatus{ - ServiceId: &serviceId, - State: utils.Ptr(tt.serviceState), + synctest.Test(t, func(t *testing.T) { + serviceId := "serviceId" + + apiClient := &apiClientServiceMocked{ + serviceId: serviceId, + serviceState: tt.serviceState, + getServiceFails: tt.getServiceFails, + } + + var wantRes *serviceenablement.ServiceStatus + if tt.wantResp { + wantRes = &serviceenablement.ServiceStatus{ + ServiceId: &serviceId, + State: utils.Ptr(tt.serviceState), + } } - } - ctx := context.Background() + ctx := context.Background() - handler := EnableServiceWaitHandler(ctx, apiClient, "eu01", "projectId", serviceId) + handler := EnableServiceWaitHandler(ctx, apiClient, "eu01", "projectId", serviceId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(0).WaitWithContext(ctx) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(0).WaitWithContext(ctx) - if err != nil { - if !tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + if err != nil { + if !tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + return + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) } - return - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + }) }, ) } @@ -160,37 +163,39 @@ func TestDisableServiceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - serviceId := "serviceId" - - apiClient := &apiClientServiceMocked{ - serviceId: serviceId, - serviceState: tt.serviceState, - getServiceFails: tt.getServiceFails, - } - - var wantRes *serviceenablement.ServiceStatus - if tt.wantResp { - wantRes = &serviceenablement.ServiceStatus{ - ServiceId: &serviceId, - State: utils.Ptr(tt.serviceState), + synctest.Test(t, func(t *testing.T) { + serviceId := "serviceId" + + apiClient := &apiClientServiceMocked{ + serviceId: serviceId, + serviceState: tt.serviceState, + getServiceFails: tt.getServiceFails, + } + + var wantRes *serviceenablement.ServiceStatus + if tt.wantResp { + wantRes = &serviceenablement.ServiceStatus{ + ServiceId: &serviceId, + State: utils.Ptr(tt.serviceState), + } } - } - ctx := context.Background() + ctx := context.Background() - handler := DisableServiceWaitHandler(ctx, apiClient, "eu01", "projectId", serviceId) + handler := DisableServiceWaitHandler(ctx, apiClient, "eu01", "projectId", serviceId) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(0).WaitWithContext(ctx) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(0).WaitWithContext(ctx) - if err != nil { - if !tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + if err != nil { + if !tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + return + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) } - return - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + }) }, ) } diff --git a/services/sfs/v1api/wait/wait_test.go b/services/sfs/v1api/wait/wait_test.go index af4d95f42..55a300c27 100644 --- a/services/sfs/v1api/wait/wait_test.go +++ b/services/sfs/v1api/wait/wait_test.go @@ -4,7 +4,7 @@ import ( "context" "net/http" "testing" - "time" + "testing/synctest" "github.com/stackitcloud/stackit-sdk-go/core/oapierror" "github.com/stackitcloud/stackit-sdk-go/core/utils" @@ -131,26 +131,25 @@ func TestCreateResourcePoolWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - apiClientMock := newAPIMock(&mockSettings{ - responses: tt.fields.responses, - }) + synctest.Test(t, func(t *testing.T) { + apiClientMock := newAPIMock(&mockSettings{ + responses: tt.fields.responses, + }) - ctx := context.Background() - handler := CreateResourcePoolWaitHandler(ctx, apiClientMock, tt.args.projectId, tt.args.region, testResourcePoolId) - handler.SetTimeout(250 * time.Millisecond) - handler.SetSleepBeforeWait(0) - handler.SetThrottle(1) - response, err := handler.WaitWithContext(ctx) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error %s, wantErr %v", err, tt.wantErr) - } - var actualState string - if response != nil { - actualState = *response.ResourcePool.State - } - if tt.wantState != actualState { - t.Errorf("wrong state want %q but got %q", tt.wantState, actualState) - } + ctx := context.Background() + handler := CreateResourcePoolWaitHandler(ctx, apiClientMock, tt.args.projectId, tt.args.region, testResourcePoolId) + response, err := handler.WaitWithContext(ctx) + if (err != nil) != tt.wantErr { + t.Fatalf("handler error %s, wantErr %v", err, tt.wantErr) + } + var actualState string + if response != nil { + actualState = *response.ResourcePool.State + } + if tt.wantState != actualState { + t.Errorf("wrong state want %q but got %q", tt.wantState, actualState) + } + }) }) } } @@ -221,26 +220,25 @@ func TestUpdateResourcePoolWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - apiClientMock := newAPIMock(&mockSettings{ - responses: tt.fields.responses, - }) + synctest.Test(t, func(t *testing.T) { + apiClientMock := newAPIMock(&mockSettings{ + responses: tt.fields.responses, + }) - ctx := context.Background() - handler := UpdateResourcePoolWaitHandler(ctx, apiClientMock, tt.args.projectId, tt.args.region, testResourcePoolId) - handler.SetTimeout(250 * time.Millisecond) - handler.SetSleepBeforeWait(0) - handler.SetThrottle(1) - response, err := handler.WaitWithContext(ctx) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error %s, wantErr %v", err, tt.wantErr) - } - var actualState string - if response != nil { - actualState = *response.ResourcePool.State - } - if tt.wantState != actualState { - t.Errorf("wrong state want %q but got %q", tt.wantState, actualState) - } + ctx := context.Background() + handler := UpdateResourcePoolWaitHandler(ctx, apiClientMock, tt.args.projectId, tt.args.region, testResourcePoolId) + response, err := handler.WaitWithContext(ctx) + if (err != nil) != tt.wantErr { + t.Fatalf("handler error %s, wantErr %v", err, tt.wantErr) + } + var actualState string + if response != nil { + actualState = *response.ResourcePool.State + } + if tt.wantState != actualState { + t.Errorf("wrong state want %q but got %q", tt.wantState, actualState) + } + }) }) } } @@ -304,19 +302,18 @@ func TestDeleteResourcePoolWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - apiClientMock := newAPIMock(&mockSettings{ - responses: tt.fields.responses, - }) + synctest.Test(t, func(t *testing.T) { + apiClientMock := newAPIMock(&mockSettings{ + responses: tt.fields.responses, + }) - ctx := context.Background() - handler := DeleteResourcePoolWaitHandler(ctx, apiClientMock, tt.args.projectId, tt.args.region, testResourcePoolId) - handler.SetTimeout(250 * time.Millisecond) - handler.SetSleepBeforeWait(0) - handler.SetThrottle(1) - _, err := handler.WaitWithContext(ctx) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error %s, wantErr %v", err, tt.wantErr) - } + ctx := context.Background() + handler := DeleteResourcePoolWaitHandler(ctx, apiClientMock, tt.args.projectId, tt.args.region, testResourcePoolId) + _, err := handler.WaitWithContext(ctx) + if (err != nil) != tt.wantErr { + t.Fatalf("handler error %s, wantErr %v", err, tt.wantErr) + } + }) }) } } @@ -387,26 +384,25 @@ func TestCreateShareWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - apiClientMock := newAPIMock(&mockSettings{ - responses: tt.fields.responses, - }) + synctest.Test(t, func(t *testing.T) { + apiClientMock := newAPIMock(&mockSettings{ + responses: tt.fields.responses, + }) - ctx := context.Background() - handler := CreateShareWaitHandler(ctx, apiClientMock, tt.args.projectId, tt.args.region, testResourcePoolId, testShareId) - handler.SetTimeout(250 * time.Millisecond) - handler.SetSleepBeforeWait(0) - handler.SetThrottle(1) - response, err := handler.WaitWithContext(ctx) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error %s, wantErr %v", err, tt.wantErr) - } - var actualState string - if response != nil { - actualState = *response.Share.State - } - if tt.wantState != actualState { - t.Errorf("wrong state want %q but got %q", tt.wantState, actualState) - } + ctx := context.Background() + handler := CreateShareWaitHandler(ctx, apiClientMock, tt.args.projectId, tt.args.region, testResourcePoolId, testShareId) + response, err := handler.WaitWithContext(ctx) + if (err != nil) != tt.wantErr { + t.Fatalf("handler error %s, wantErr %v", err, tt.wantErr) + } + var actualState string + if response != nil { + actualState = *response.Share.State + } + if tt.wantState != actualState { + t.Errorf("wrong state want %q but got %q", tt.wantState, actualState) + } + }) }) } } @@ -477,26 +473,25 @@ func TestUpdateShareWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - apiClientMock := newAPIMock(&mockSettings{ - responses: tt.fields.responses, - }) + synctest.Test(t, func(t *testing.T) { + apiClientMock := newAPIMock(&mockSettings{ + responses: tt.fields.responses, + }) - ctx := context.Background() - handler := UpdateShareWaitHandler(ctx, apiClientMock, tt.args.projectId, tt.args.region, testResourcePoolId, testShareId) - handler.SetTimeout(250 * time.Millisecond) - handler.SetSleepBeforeWait(0) - handler.SetThrottle(1) - response, err := handler.WaitWithContext(ctx) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error %s, wantErr %v", err, tt.wantErr) - } - var actualState string - if response != nil { - actualState = *response.Share.State - } - if tt.wantState != actualState { - t.Errorf("wrong state want %q but got %q", tt.wantState, actualState) - } + ctx := context.Background() + handler := UpdateShareWaitHandler(ctx, apiClientMock, tt.args.projectId, tt.args.region, testResourcePoolId, testShareId) + response, err := handler.WaitWithContext(ctx) + if (err != nil) != tt.wantErr { + t.Fatalf("handler error %s, wantErr %v", err, tt.wantErr) + } + var actualState string + if response != nil { + actualState = *response.Share.State + } + if tt.wantState != actualState { + t.Errorf("wrong state want %q but got %q", tt.wantState, actualState) + } + }) }) } } @@ -582,19 +577,18 @@ func TestDeleteShareWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - apiClientMock := newAPIMock(&mockSettings{ - responses: tt.fields.responses, - }) + synctest.Test(t, func(t *testing.T) { + apiClientMock := newAPIMock(&mockSettings{ + responses: tt.fields.responses, + }) - ctx := context.Background() - handler := DeleteShareWaitHandler(ctx, apiClientMock, tt.args.projectId, tt.args.region, testResourcePoolId, testShareId) - handler.SetTimeout(250 * time.Millisecond) - handler.SetSleepBeforeWait(0) - handler.SetThrottle(1) - _, err := handler.WaitWithContext(ctx) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error %s, wantErr %v", err, tt.wantErr) - } + ctx := context.Background() + handler := DeleteShareWaitHandler(ctx, apiClientMock, tt.args.projectId, tt.args.region, testResourcePoolId, testShareId) + _, err := handler.WaitWithContext(ctx) + if (err != nil) != tt.wantErr { + t.Fatalf("handler error %s, wantErr %v", err, tt.wantErr) + } + }) }) } } diff --git a/services/sfs/wait/wait_test.go b/services/sfs/wait/wait_test.go index 3476c8c89..10e6a100c 100644 --- a/services/sfs/wait/wait_test.go +++ b/services/sfs/wait/wait_test.go @@ -4,7 +4,7 @@ import ( "context" "net/http" "testing" - "time" + "testing/synctest" "github.com/stackitcloud/stackit-sdk-go/core/oapierror" "github.com/stackitcloud/stackit-sdk-go/services/sfs" @@ -131,25 +131,24 @@ func TestCreateResourcePoolWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - apiClientMock := apiClientMock{ - responses: tt.fields.responses, - } - ctx := context.Background() - handler := CreateResourcePoolWaitHandler(ctx, &apiClientMock, tt.args.projectId, tt.args.region, testResourcePoolId) - handler.SetTimeout(500 * time.Millisecond) - handler.SetSleepBeforeWait(0) - handler.SetThrottle(1) - response, err := handler.WaitWithContext(ctx) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error %s, wantErr %v", err, tt.wantErr) - } - var actualState string - if response != nil { - actualState = *response.ResourcePool.State - } - if tt.wantState != actualState { - t.Errorf("wrong state want %q but got %q", tt.wantState, actualState) - } + synctest.Test(t, func(t *testing.T) { + apiClientMock := apiClientMock{ + responses: tt.fields.responses, + } + ctx := context.Background() + handler := CreateResourcePoolWaitHandler(ctx, &apiClientMock, tt.args.projectId, tt.args.region, testResourcePoolId) + response, err := handler.WaitWithContext(ctx) + if (err != nil) != tt.wantErr { + t.Fatalf("handler error %s, wantErr %v", err, tt.wantErr) + } + var actualState string + if response != nil { + actualState = *response.ResourcePool.State + } + if tt.wantState != actualState { + t.Errorf("wrong state want %q but got %q", tt.wantState, actualState) + } + }) }) } } @@ -220,25 +219,24 @@ func TestUpdateResourcePoolWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - apiClientMock := apiClientMock{ - responses: tt.fields.responses, - } - ctx := context.Background() - handler := UpdateResourcePoolWaitHandler(ctx, &apiClientMock, tt.args.projectId, tt.args.region, testResourcePoolId) - handler.SetTimeout(250 * time.Millisecond) - handler.SetSleepBeforeWait(0) - handler.SetThrottle(1) - response, err := handler.WaitWithContext(ctx) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error %s, wantErr %v", err, tt.wantErr) - } - var actualState string - if response != nil { - actualState = *response.ResourcePool.State - } - if tt.wantState != actualState { - t.Errorf("wrong state want %q but got %q", tt.wantState, actualState) - } + synctest.Test(t, func(t *testing.T) { + apiClientMock := apiClientMock{ + responses: tt.fields.responses, + } + ctx := context.Background() + handler := UpdateResourcePoolWaitHandler(ctx, &apiClientMock, tt.args.projectId, tt.args.region, testResourcePoolId) + response, err := handler.WaitWithContext(ctx) + if (err != nil) != tt.wantErr { + t.Fatalf("handler error %s, wantErr %v", err, tt.wantErr) + } + var actualState string + if response != nil { + actualState = *response.ResourcePool.State + } + if tt.wantState != actualState { + t.Errorf("wrong state want %q but got %q", tt.wantState, actualState) + } + }) }) } } @@ -302,18 +300,17 @@ func TestDeleteResourcePoolWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - apiClientMock := apiClientMock{ - responses: tt.fields.responses, - } - ctx := context.Background() - handler := DeleteResourcePoolWaitHandler(ctx, &apiClientMock, tt.args.projectId, tt.args.region, testResourcePoolId) - handler.SetTimeout(250 * time.Millisecond) - handler.SetSleepBeforeWait(0) - handler.SetThrottle(1) - _, err := handler.WaitWithContext(ctx) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error %s, wantErr %v", err, tt.wantErr) - } + synctest.Test(t, func(t *testing.T) { + apiClientMock := apiClientMock{ + responses: tt.fields.responses, + } + ctx := context.Background() + handler := DeleteResourcePoolWaitHandler(ctx, &apiClientMock, tt.args.projectId, tt.args.region, testResourcePoolId) + _, err := handler.WaitWithContext(ctx) + if (err != nil) != tt.wantErr { + t.Fatalf("handler error %s, wantErr %v", err, tt.wantErr) + } + }) }) } } @@ -384,25 +381,24 @@ func TestCreateShareWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - apiClientMock := apiClientMock{ - responses: tt.fields.responses, - } - ctx := context.Background() - handler := CreateShareWaitHandler(ctx, &apiClientMock, tt.args.projectId, tt.args.region, testResourcePoolId, testShareId) - handler.SetTimeout(250 * time.Millisecond) - handler.SetSleepBeforeWait(0) - handler.SetThrottle(1) - response, err := handler.WaitWithContext(ctx) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error %s, wantErr %v", err, tt.wantErr) - } - var actualState string - if response != nil { - actualState = *response.Share.State - } - if tt.wantState != actualState { - t.Errorf("wrong state want %q but got %q", tt.wantState, actualState) - } + synctest.Test(t, func(t *testing.T) { + apiClientMock := apiClientMock{ + responses: tt.fields.responses, + } + ctx := context.Background() + handler := CreateShareWaitHandler(ctx, &apiClientMock, tt.args.projectId, tt.args.region, testResourcePoolId, testShareId) + response, err := handler.WaitWithContext(ctx) + if (err != nil) != tt.wantErr { + t.Fatalf("handler error %s, wantErr %v", err, tt.wantErr) + } + var actualState string + if response != nil { + actualState = *response.Share.State + } + if tt.wantState != actualState { + t.Errorf("wrong state want %q but got %q", tt.wantState, actualState) + } + }) }) } } @@ -473,25 +469,24 @@ func TestUpdateShareWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - apiClientMock := apiClientMock{ - responses: tt.fields.responses, - } - ctx := context.Background() - handler := UpdateShareWaitHandler(ctx, &apiClientMock, tt.args.projectId, tt.args.region, testResourcePoolId, testShareId) - handler.SetTimeout(250 * time.Millisecond) - handler.SetSleepBeforeWait(0) - handler.SetThrottle(1) - response, err := handler.WaitWithContext(ctx) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error %s, wantErr %v", err, tt.wantErr) - } - var actualState string - if response != nil { - actualState = *response.Share.State - } - if tt.wantState != actualState { - t.Errorf("wrong state want %q but got %q", tt.wantState, actualState) - } + synctest.Test(t, func(t *testing.T) { + apiClientMock := apiClientMock{ + responses: tt.fields.responses, + } + ctx := context.Background() + handler := UpdateShareWaitHandler(ctx, &apiClientMock, tt.args.projectId, tt.args.region, testResourcePoolId, testShareId) + response, err := handler.WaitWithContext(ctx) + if (err != nil) != tt.wantErr { + t.Fatalf("handler error %s, wantErr %v", err, tt.wantErr) + } + var actualState string + if response != nil { + actualState = *response.Share.State + } + if tt.wantState != actualState { + t.Errorf("wrong state want %q but got %q", tt.wantState, actualState) + } + }) }) } } @@ -577,18 +572,17 @@ func TestDeleteShareWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - apiClientMock := apiClientMock{ - responses: tt.fields.responses, - } - ctx := context.Background() - handler := DeleteShareWaitHandler(ctx, &apiClientMock, tt.args.projectId, tt.args.region, testResourcePoolId, testShareId) - handler.SetTimeout(250 * time.Millisecond) - handler.SetSleepBeforeWait(0) - handler.SetThrottle(1) - _, err := handler.WaitWithContext(ctx) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error %s, wantErr %v", err, tt.wantErr) - } + synctest.Test(t, func(t *testing.T) { + apiClientMock := apiClientMock{ + responses: tt.fields.responses, + } + ctx := context.Background() + handler := DeleteShareWaitHandler(ctx, &apiClientMock, tt.args.projectId, tt.args.region, testResourcePoolId, testShareId) + _, err := handler.WaitWithContext(ctx) + if (err != nil) != tt.wantErr { + t.Fatalf("handler error %s, wantErr %v", err, tt.wantErr) + } + }) }) } } diff --git a/services/ske/v2api/wait/wait_test.go b/services/ske/v2api/wait/wait_test.go index c879fadf9..fb7b60fc9 100644 --- a/services/ske/v2api/wait/wait_test.go +++ b/services/ske/v2api/wait/wait_test.go @@ -4,6 +4,7 @@ import ( "context" "net/http" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -120,43 +121,45 @@ func TestCreateOrUpdateClusterWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - name := "cluster" - - apiClient := newAPIMock(mockSettings{ - getFails: tt.getFails, - name: name, - resourceState: tt.resourceState, - invalidArgusInstance: tt.invalidArgusInstance, - }) - - var wantRes *ske.Cluster - rs := ske.ClusterStatusState(tt.resourceState) - if tt.wantResp { - wantRes = &ske.Cluster{ - Name: &name, - Status: &ske.ClusterStatus{ - Aggregated: &rs, - }, - } + synctest.Test(t, func(t *testing.T) { + name := "cluster" + + apiClient := newAPIMock(mockSettings{ + getFails: tt.getFails, + name: name, + resourceState: tt.resourceState, + invalidArgusInstance: tt.invalidArgusInstance, + }) + + var wantRes *ske.Cluster + rs := ske.ClusterStatusState(tt.resourceState) + if tt.wantResp { + wantRes = &ske.Cluster{ + Name: &name, + Status: &ske.ClusterStatus{ + Aggregated: &rs, + }, + } - if tt.invalidArgusInstance { - wantRes.Status.Error = &ske.RuntimeError{ - Code: utils.Ptr(RUNTIMEERRORCODE_OBSERVABILITY_INSTANCE_NOT_FOUND), - Message: utils.Ptr("invalid argus instance"), + if tt.invalidArgusInstance { + wantRes.Status.Error = &ske.RuntimeError{ + Code: utils.Ptr(RUNTIMEERRORCODE_OBSERVABILITY_INSTANCE_NOT_FOUND), + Message: utils.Ptr("invalid argus instance"), + } } } - } - handler := CreateOrUpdateClusterWaitHandler(context.Background(), apiClient, "", testRegion, name) + handler := CreateOrUpdateClusterWaitHandler(context.Background(), apiClient, "", testRegion, name) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %+v, want %+v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %+v, want %+v", gotRes, wantRes) + } + }) }) } } @@ -199,34 +202,36 @@ func TestTriggerClusterHibernationWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.description, func(t *testing.T) { - name := "cluster" - - apiClient := newAPIMock(mockSettings{ - getFails: tt.getFails, - name: name, - resourceState: tt.resourceState, - }) - - var wantRes *ske.Cluster - if tt.wantResp { - wantRes = &ske.Cluster{ - Name: &name, - Status: &ske.ClusterStatus{ - Aggregated: utils.Ptr(tt.resourceState), - }, + synctest.Test(t, func(t *testing.T) { + name := "cluster" + + apiClient := newAPIMock(mockSettings{ + getFails: tt.getFails, + name: name, + resourceState: tt.resourceState, + }) + + var wantRes *ske.Cluster + if tt.wantResp { + wantRes = &ske.Cluster{ + Name: &name, + Status: &ske.ClusterStatus{ + Aggregated: utils.Ptr(tt.resourceState), + }, + } } - } - handler := TriggerClusterHibernationWaitHandler(context.Background(), apiClient, "", testRegion, name) + handler := TriggerClusterHibernationWaitHandler(context.Background(), apiClient, "", testRegion, name) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %+v, want %+v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %+v, want %+v", gotRes, wantRes) + } + }) }) } } @@ -269,34 +274,36 @@ func TestTriggerClusterMaintenanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.description, func(t *testing.T) { - name := "cluster" - - apiClient := newAPIMock(mockSettings{ - getFails: tt.getFails, - name: name, - resourceState: tt.resourceState, - }) - - var wantRes *ske.Cluster - if tt.wantResp { - wantRes = &ske.Cluster{ - Name: &name, - Status: &ske.ClusterStatus{ - Aggregated: utils.Ptr(tt.resourceState), - }, + synctest.Test(t, func(t *testing.T) { + name := "cluster" + + apiClient := newAPIMock(mockSettings{ + getFails: tt.getFails, + name: name, + resourceState: tt.resourceState, + }) + + var wantRes *ske.Cluster + if tt.wantResp { + wantRes = &ske.Cluster{ + Name: &name, + Status: &ske.ClusterStatus{ + Aggregated: utils.Ptr(tt.resourceState), + }, + } } - } - handler := TriggerClusterMaintenanceWaitHandler(context.Background(), apiClient, "", testRegion, name) + handler := TriggerClusterMaintenanceWaitHandler(context.Background(), apiClient, "", testRegion, name) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %+v, want %+v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %+v, want %+v", gotRes, wantRes) + } + }) }) } } @@ -339,34 +346,36 @@ func TestTriggerClusterWakeupWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.description, func(t *testing.T) { - name := "cluster" - - apiClient := newAPIMock(mockSettings{ - getFails: tt.getFails, - name: name, - resourceState: tt.resourceState, - }) - - var wantRes *ske.Cluster - if tt.wantResp { - wantRes = &ske.Cluster{ - Name: &name, - Status: &ske.ClusterStatus{ - Aggregated: utils.Ptr(tt.resourceState), - }, + synctest.Test(t, func(t *testing.T) { + name := "cluster" + + apiClient := newAPIMock(mockSettings{ + getFails: tt.getFails, + name: name, + resourceState: tt.resourceState, + }) + + var wantRes *ske.Cluster + if tt.wantResp { + wantRes = &ske.Cluster{ + Name: &name, + Status: &ske.ClusterStatus{ + Aggregated: utils.Ptr(tt.resourceState), + }, + } } - } - handler := TriggerClusterWakeupWaitHandler(context.Background(), apiClient, "", testRegion, name) + handler := TriggerClusterWakeupWaitHandler(context.Background(), apiClient, "", testRegion, name) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %+v, want %+v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %+v, want %+v", gotRes, wantRes) + } + }) }) } } @@ -409,34 +418,36 @@ func TestTriggerClusterReconciliationWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.description, func(t *testing.T) { - name := "cluster" - - apiClient := newAPIMock(mockSettings{ - getFails: tt.getFails, - name: name, - resourceState: tt.resourceState, - }) - - var wantRes *ske.Cluster - if tt.wantResp { - wantRes = &ske.Cluster{ - Name: &name, - Status: &ske.ClusterStatus{ - Aggregated: utils.Ptr(tt.resourceState), - }, + synctest.Test(t, func(t *testing.T) { + name := "cluster" + + apiClient := newAPIMock(mockSettings{ + getFails: tt.getFails, + name: name, + resourceState: tt.resourceState, + }) + + var wantRes *ske.Cluster + if tt.wantResp { + wantRes = &ske.Cluster{ + Name: &name, + Status: &ske.ClusterStatus{ + Aggregated: utils.Ptr(tt.resourceState), + }, + } } - } - handler := TriggerClusterReconciliationWaitHandler(context.Background(), apiClient, "", testRegion, name) + handler := TriggerClusterReconciliationWaitHandler(context.Background(), apiClient, "", testRegion, name) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %+v, want %+v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %+v, want %+v", gotRes, wantRes) + } + }) }) } } @@ -479,34 +490,36 @@ func TestRotateCredentialsWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - name := "cluster" - - apiClient := newAPIMock(mockSettings{ - getFails: tt.getFails, - name: name, - resourceState: tt.resourceState, - }) - - var wantRes *ske.Cluster - if tt.wantResp { - wantRes = &ske.Cluster{ - Name: &name, - Status: &ske.ClusterStatus{ - Aggregated: utils.Ptr(tt.resourceState), - }, + synctest.Test(t, func(t *testing.T) { + name := "cluster" + + apiClient := newAPIMock(mockSettings{ + getFails: tt.getFails, + name: name, + resourceState: tt.resourceState, + }) + + var wantRes *ske.Cluster + if tt.wantResp { + wantRes = &ske.Cluster{ + Name: &name, + Status: &ske.ClusterStatus{ + Aggregated: utils.Ptr(tt.resourceState), + }, + } } - } - handler := RotateCredentialsWaitHandler(context.Background(), apiClient, "", testRegion, name) + handler := RotateCredentialsWaitHandler(context.Background(), apiClient, "", testRegion, name) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %+v, want %+v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %+v, want %+v", gotRes, wantRes) + } + }) }) } } diff --git a/services/ske/wait/wait_test.go b/services/ske/wait/wait_test.go index bd9ab82dc..f5c64c74b 100644 --- a/services/ske/wait/wait_test.go +++ b/services/ske/wait/wait_test.go @@ -4,6 +4,7 @@ import ( "context" "net/http" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -124,42 +125,44 @@ func TestCreateOrUpdateClusterWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - name := "cluster" - - apiClient := &apiClientClusterMocked{ - getFails: tt.getFails, - name: name, - resourceState: tt.resourceState, - invalidArgusInstance: tt.invalidArgusInstance, - } - var wantRes *ske.Cluster - rs := ske.ClusterStatusState(tt.resourceState) - if tt.wantResp { - wantRes = &ske.Cluster{ - Name: &name, - Status: &ske.ClusterStatus{ - Aggregated: &rs, - }, + synctest.Test(t, func(t *testing.T) { + name := "cluster" + + apiClient := &apiClientClusterMocked{ + getFails: tt.getFails, + name: name, + resourceState: tt.resourceState, + invalidArgusInstance: tt.invalidArgusInstance, } + var wantRes *ske.Cluster + rs := ske.ClusterStatusState(tt.resourceState) + if tt.wantResp { + wantRes = &ske.Cluster{ + Name: &name, + Status: &ske.ClusterStatus{ + Aggregated: &rs, + }, + } - if tt.invalidArgusInstance { - wantRes.Status.Error = &ske.RuntimeError{ - Code: utils.Ptr(ske.RUNTIMEERRORCODE_OBSERVABILITY_INSTANCE_NOT_FOUND), - Message: utils.Ptr("invalid argus instance"), + if tt.invalidArgusInstance { + wantRes.Status.Error = &ske.RuntimeError{ + Code: utils.Ptr(ske.RUNTIMEERRORCODE_OBSERVABILITY_INSTANCE_NOT_FOUND), + Message: utils.Ptr("invalid argus instance"), + } } } - } - handler := CreateOrUpdateClusterWaitHandler(context.Background(), apiClient, "", testRegion, name) + handler := CreateOrUpdateClusterWaitHandler(context.Background(), apiClient, "", testRegion, name) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %+v, want %+v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %+v, want %+v", gotRes, wantRes) + } + }) }) } } @@ -202,33 +205,35 @@ func TestTriggerClusterHibernationWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.description, func(t *testing.T) { - name := "cluster" - - apiClient := &apiClientClusterMocked{ - getFails: tt.getFails, - name: name, - resourceState: tt.resourceState, - } - var wantRes *ske.Cluster - if tt.wantResp { - wantRes = &ske.Cluster{ - Name: &name, - Status: &ske.ClusterStatus{ - Aggregated: utils.Ptr(tt.resourceState), - }, + synctest.Test(t, func(t *testing.T) { + name := "cluster" + + apiClient := &apiClientClusterMocked{ + getFails: tt.getFails, + name: name, + resourceState: tt.resourceState, + } + var wantRes *ske.Cluster + if tt.wantResp { + wantRes = &ske.Cluster{ + Name: &name, + Status: &ske.ClusterStatus{ + Aggregated: utils.Ptr(tt.resourceState), + }, + } } - } - handler := TriggerClusterHibernationWaitHandler(context.Background(), apiClient, "", testRegion, name) + handler := TriggerClusterHibernationWaitHandler(context.Background(), apiClient, "", testRegion, name) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %+v, want %+v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %+v, want %+v", gotRes, wantRes) + } + }) }) } } @@ -271,33 +276,35 @@ func TestTriggerClusterMaintenanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.description, func(t *testing.T) { - name := "cluster" - - apiClient := &apiClientClusterMocked{ - getFails: tt.getFails, - name: name, - resourceState: tt.resourceState, - } - var wantRes *ske.Cluster - if tt.wantResp { - wantRes = &ske.Cluster{ - Name: &name, - Status: &ske.ClusterStatus{ - Aggregated: utils.Ptr(tt.resourceState), - }, + synctest.Test(t, func(t *testing.T) { + name := "cluster" + + apiClient := &apiClientClusterMocked{ + getFails: tt.getFails, + name: name, + resourceState: tt.resourceState, + } + var wantRes *ske.Cluster + if tt.wantResp { + wantRes = &ske.Cluster{ + Name: &name, + Status: &ske.ClusterStatus{ + Aggregated: utils.Ptr(tt.resourceState), + }, + } } - } - handler := TriggerClusterMaintenanceWaitHandler(context.Background(), apiClient, "", testRegion, name) + handler := TriggerClusterMaintenanceWaitHandler(context.Background(), apiClient, "", testRegion, name) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %+v, want %+v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %+v, want %+v", gotRes, wantRes) + } + }) }) } } @@ -340,33 +347,35 @@ func TestTriggerClusterWakeupWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.description, func(t *testing.T) { - name := "cluster" - - apiClient := &apiClientClusterMocked{ - getFails: tt.getFails, - name: name, - resourceState: tt.resourceState, - } - var wantRes *ske.Cluster - if tt.wantResp { - wantRes = &ske.Cluster{ - Name: &name, - Status: &ske.ClusterStatus{ - Aggregated: utils.Ptr(tt.resourceState), - }, + synctest.Test(t, func(t *testing.T) { + name := "cluster" + + apiClient := &apiClientClusterMocked{ + getFails: tt.getFails, + name: name, + resourceState: tt.resourceState, + } + var wantRes *ske.Cluster + if tt.wantResp { + wantRes = &ske.Cluster{ + Name: &name, + Status: &ske.ClusterStatus{ + Aggregated: utils.Ptr(tt.resourceState), + }, + } } - } - handler := TriggerClusterWakeupWaitHandler(context.Background(), apiClient, "", testRegion, name) + handler := TriggerClusterWakeupWaitHandler(context.Background(), apiClient, "", testRegion, name) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %+v, want %+v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %+v, want %+v", gotRes, wantRes) + } + }) }) } } @@ -409,33 +418,35 @@ func TestTriggerClusterReconciliationWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.description, func(t *testing.T) { - name := "cluster" - - apiClient := &apiClientClusterMocked{ - getFails: tt.getFails, - name: name, - resourceState: tt.resourceState, - } - var wantRes *ske.Cluster - if tt.wantResp { - wantRes = &ske.Cluster{ - Name: &name, - Status: &ske.ClusterStatus{ - Aggregated: utils.Ptr(tt.resourceState), - }, + synctest.Test(t, func(t *testing.T) { + name := "cluster" + + apiClient := &apiClientClusterMocked{ + getFails: tt.getFails, + name: name, + resourceState: tt.resourceState, + } + var wantRes *ske.Cluster + if tt.wantResp { + wantRes = &ske.Cluster{ + Name: &name, + Status: &ske.ClusterStatus{ + Aggregated: utils.Ptr(tt.resourceState), + }, + } } - } - handler := TriggerClusterReconciliationWaitHandler(context.Background(), apiClient, "", testRegion, name) + handler := TriggerClusterReconciliationWaitHandler(context.Background(), apiClient, "", testRegion, name) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %+v, want %+v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %+v, want %+v", gotRes, wantRes) + } + }) }) } } @@ -485,33 +496,35 @@ func TestRotateCredentialsWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - name := "cluster" - - apiClient := &apiClientClusterMocked{ - getFails: tt.getFails, - name: name, - resourceState: tt.resourceState, - } - var wantRes *ske.Cluster - if tt.wantResp { - wantRes = &ske.Cluster{ - Name: &name, - Status: &ske.ClusterStatus{ - Aggregated: utils.Ptr(tt.resourceState), - }, + synctest.Test(t, func(t *testing.T) { + name := "cluster" + + apiClient := &apiClientClusterMocked{ + getFails: tt.getFails, + name: name, + resourceState: tt.resourceState, + } + var wantRes *ske.Cluster + if tt.wantResp { + wantRes = &ske.Cluster{ + Name: &name, + Status: &ske.ClusterStatus{ + Aggregated: utils.Ptr(tt.resourceState), + }, + } } - } - handler := RotateCredentialsWaitHandler(context.Background(), apiClient, "", testRegion, name) + handler := RotateCredentialsWaitHandler(context.Background(), apiClient, "", testRegion, name) - gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %+v, want %+v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %+v, want %+v", gotRes, wantRes) + } + }) }) } } diff --git a/services/sqlserverflex/v2api/wait/wait_test.go b/services/sqlserverflex/v2api/wait/wait_test.go index bb741935b..1721e53e1 100644 --- a/services/sqlserverflex/v2api/wait/wait_test.go +++ b/services/sqlserverflex/v2api/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -91,35 +92,37 @@ func TestCreateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - instanceState := tt.instanceState + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + instanceState := tt.instanceState - apiClient := newAPIMock(mockSettings{ - instanceId: &instanceId, - instanceState: &instanceState, - instanceGetFails: tt.instanceGetFails, - }) + apiClient := newAPIMock(mockSettings{ + instanceId: &instanceId, + instanceState: &instanceState, + instanceGetFails: tt.instanceGetFails, + }) - var wantRes *sqlserverflex.GetInstanceResponse - if tt.wantResp { - wantRes = &sqlserverflex.GetInstanceResponse{ - Item: &sqlserverflex.Instance{ - Id: &instanceId, - Status: utils.Ptr(tt.instanceState), - }, + var wantRes *sqlserverflex.GetInstanceResponse + if tt.wantResp { + wantRes = &sqlserverflex.GetInstanceResponse{ + Item: &sqlserverflex.Instance{ + Id: &instanceId, + Status: utils.Ptr(tt.instanceState), + }, + } } - } - handler := CreateInstanceWaitHandler(context.Background(), apiClient, "", instanceId, "") + handler := CreateInstanceWaitHandler(context.Background(), apiClient, "", instanceId, "") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -169,35 +172,37 @@ func TestUpdateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - instanceState := tt.instanceState + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + instanceState := tt.instanceState - apiClient := newAPIMock(mockSettings{ - instanceId: &instanceId, - instanceState: &instanceState, - instanceGetFails: tt.instanceGetFails, - }) + apiClient := newAPIMock(mockSettings{ + instanceId: &instanceId, + instanceState: &instanceState, + instanceGetFails: tt.instanceGetFails, + }) - var wantRes *sqlserverflex.GetInstanceResponse - if tt.wantResp { - wantRes = &sqlserverflex.GetInstanceResponse{ - Item: &sqlserverflex.Instance{ - Id: &instanceId, - Status: utils.Ptr(tt.instanceState), - }, + var wantRes *sqlserverflex.GetInstanceResponse + if tt.wantResp { + wantRes = &sqlserverflex.GetInstanceResponse{ + Item: &sqlserverflex.Instance{ + Id: &instanceId, + Status: utils.Ptr(tt.instanceState), + }, + } } - } - handler := UpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId, "") + handler := UpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId, "") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -229,23 +234,25 @@ func TestDeleteInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - instanceState := tt.instanceState - - apiClient := newAPIMock(mockSettings{ - instanceGetFails: tt.instanceGetFails, - instanceIsDeleted: tt.instanceState == InstanceStateSuccess, - instanceId: &instanceId, - instanceState: &instanceState, - }) + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + instanceState := tt.instanceState - handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", instanceId, "") + apiClient := newAPIMock(mockSettings{ + instanceGetFails: tt.instanceGetFails, + instanceIsDeleted: tt.instanceState == InstanceStateSuccess, + instanceId: &instanceId, + instanceState: &instanceState, + }) - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", instanceId, "") - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } } diff --git a/services/sqlserverflex/wait/wait_test.go b/services/sqlserverflex/wait/wait_test.go index 6791c256f..646e86c9f 100644 --- a/services/sqlserverflex/wait/wait_test.go +++ b/services/sqlserverflex/wait/wait_test.go @@ -3,6 +3,7 @@ package wait import ( "context" "testing" + "testing/synctest" "time" "github.com/google/go-cmp/cmp" @@ -86,34 +87,36 @@ func TestCreateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := &apiClientInstanceMocked{ - instanceId: instanceId, - instanceState: tt.instanceState, - instanceGetFails: tt.instanceGetFails, - } - - var wantRes *sqlserverflex.GetInstanceResponse - if tt.wantResp { - wantRes = &sqlserverflex.GetInstanceResponse{ - Item: &sqlserverflex.Instance{ - Id: &instanceId, - Status: utils.Ptr(tt.instanceState), - }, + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := &apiClientInstanceMocked{ + instanceId: instanceId, + instanceState: tt.instanceState, + instanceGetFails: tt.instanceGetFails, + } + + var wantRes *sqlserverflex.GetInstanceResponse + if tt.wantResp { + wantRes = &sqlserverflex.GetInstanceResponse{ + Item: &sqlserverflex.Instance{ + Id: &instanceId, + Status: utils.Ptr(tt.instanceState), + }, + } } - } - handler := CreateInstanceWaitHandler(context.Background(), apiClient, "", instanceId, "") + handler := CreateInstanceWaitHandler(context.Background(), apiClient, "", instanceId, "") - gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) + gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -163,34 +166,36 @@ func TestUpdateInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := &apiClientInstanceMocked{ - instanceId: instanceId, - instanceState: tt.instanceState, - instanceGetFails: tt.instanceGetFails, - } - - var wantRes *sqlserverflex.GetInstanceResponse - if tt.wantResp { - wantRes = &sqlserverflex.GetInstanceResponse{ - Item: &sqlserverflex.Instance{ - Id: &instanceId, - Status: utils.Ptr(tt.instanceState), - }, + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := &apiClientInstanceMocked{ + instanceId: instanceId, + instanceState: tt.instanceState, + instanceGetFails: tt.instanceGetFails, } - } - handler := UpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId, "") + var wantRes *sqlserverflex.GetInstanceResponse + if tt.wantResp { + wantRes = &sqlserverflex.GetInstanceResponse{ + Item: &sqlserverflex.Instance{ + Id: &instanceId, + Status: utils.Ptr(tt.instanceState), + }, + } + } - gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) + handler := UpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId, "") - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } - if !cmp.Equal(gotRes, wantRes) { - t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) - } + gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background()) + + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + if !cmp.Equal(gotRes, wantRes) { + t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes) + } + }) }) } } @@ -222,22 +227,24 @@ func TestDeleteInstanceWaitHandler(t *testing.T) { } for _, tt := range tests { t.Run(tt.desc, func(t *testing.T) { - instanceId := "foo-bar" - - apiClient := &apiClientInstanceMocked{ - instanceGetFails: tt.instanceGetFails, - instanceIsDeleted: tt.instanceState == InstanceStateSuccess, - instanceId: instanceId, - instanceState: tt.instanceState, - } + synctest.Test(t, func(t *testing.T) { + instanceId := "foo-bar" + + apiClient := &apiClientInstanceMocked{ + instanceGetFails: tt.instanceGetFails, + instanceIsDeleted: tt.instanceState == InstanceStateSuccess, + instanceId: instanceId, + instanceState: tt.instanceState, + } - handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", instanceId, "") + handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", instanceId, "") - _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) + _, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background()) - if (err != nil) != tt.wantErr { - t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) - } + if (err != nil) != tt.wantErr { + t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr) + } + }) }) } }