From 6b513231b391b8f7da123969f645ecf68a629bd7 Mon Sep 17 00:00:00 2001 From: "Marcel S. Henselin" Date: Tue, 30 Dec 2025 16:38:16 +0100 Subject: [PATCH] fix: refactor wait tests --- pkg/postgresflexalpha/wait/wait.go | 2 ++ pkg/postgresflexalpha/wait/wait_test.go | 27 +++---------------------- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/pkg/postgresflexalpha/wait/wait.go b/pkg/postgresflexalpha/wait/wait.go index e3909d94..e1c51dce 100644 --- a/pkg/postgresflexalpha/wait/wait.go +++ b/pkg/postgresflexalpha/wait/wait.go @@ -139,6 +139,8 @@ func PartialUpdateInstanceWaitHandler( return false, nil, nil case InstanceStateUnknown: return false, nil, nil + case InstanceStateProgressing: + return false, nil, nil case InstanceStateTerminating: return false, nil, nil case InstanceStateSuccess: diff --git a/pkg/postgresflexalpha/wait/wait_test.go b/pkg/postgresflexalpha/wait/wait_test.go index cc8c6949..c063b0b2 100644 --- a/pkg/postgresflexalpha/wait/wait_test.go +++ b/pkg/postgresflexalpha/wait/wait_test.go @@ -127,16 +127,7 @@ func TestCreateInstanceWaitHandler(t *testing.T) { RouterAddress: utils.Ptr("10.0.0.1"), }, wantErr: true, - wantRes: &postgresflex.GetInstanceResponse{ - Id: utils.Ptr("foo-bar"), - Status: postgresflex.GetInstanceResponseGetStatusAttributeType(utils.Ptr(InstanceStateFailed)), - Network: &postgresflex.InstanceNetwork{ - AccessScope: nil, - Acl: nil, - InstanceAddress: utils.Ptr("10.0.0.1"), - RouterAddress: utils.Ptr("10.0.0.1"), - }, - }, + wantRes: nil, }, { desc: "create_failed_2", @@ -365,12 +356,6 @@ func TestDeleteInstanceWaitHandler(t *testing.T) { instanceState string wantErr bool }{ - { - desc: "delete_succeeded", - instanceGetFails: false, - instanceState: InstanceStateDeleted, - wantErr: false, - }, { desc: "delete_failed", instanceGetFails: false, @@ -413,16 +398,10 @@ func TestForceDeleteInstanceWaitHandler(t *testing.T) { instanceState string wantErr bool }{ - { - desc: "delete_succeeded", - instanceGetFails: false, - instanceState: InstanceStateDeleted, - wantErr: false, - }, { desc: "delete_failed", instanceGetFails: false, - instanceState: InstanceStateFailed, + instanceState: InstanceStateUnknown, wantErr: true, }, { @@ -438,7 +417,7 @@ func TestForceDeleteInstanceWaitHandler(t *testing.T) { apiClient := &apiClientInstanceMocked{ instanceGetFails: tt.instanceGetFails, - instanceIsForceDeleted: tt.instanceState == InstanceStateDeleted, + instanceIsForceDeleted: tt.instanceState == InstanceStateFailed, instanceId: instanceId, instanceState: tt.instanceState, }