fix: refactor wait tests
This commit is contained in:
parent
b374a2b300
commit
6b513231b3
2 changed files with 5 additions and 24 deletions
|
|
@ -139,6 +139,8 @@ func PartialUpdateInstanceWaitHandler(
|
||||||
return false, nil, nil
|
return false, nil, nil
|
||||||
case InstanceStateUnknown:
|
case InstanceStateUnknown:
|
||||||
return false, nil, nil
|
return false, nil, nil
|
||||||
|
case InstanceStateProgressing:
|
||||||
|
return false, nil, nil
|
||||||
case InstanceStateTerminating:
|
case InstanceStateTerminating:
|
||||||
return false, nil, nil
|
return false, nil, nil
|
||||||
case InstanceStateSuccess:
|
case InstanceStateSuccess:
|
||||||
|
|
|
||||||
|
|
@ -127,16 +127,7 @@ func TestCreateInstanceWaitHandler(t *testing.T) {
|
||||||
RouterAddress: utils.Ptr("10.0.0.1"),
|
RouterAddress: utils.Ptr("10.0.0.1"),
|
||||||
},
|
},
|
||||||
wantErr: true,
|
wantErr: true,
|
||||||
wantRes: &postgresflex.GetInstanceResponse{
|
wantRes: nil,
|
||||||
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"),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
desc: "create_failed_2",
|
desc: "create_failed_2",
|
||||||
|
|
@ -365,12 +356,6 @@ func TestDeleteInstanceWaitHandler(t *testing.T) {
|
||||||
instanceState string
|
instanceState string
|
||||||
wantErr bool
|
wantErr bool
|
||||||
}{
|
}{
|
||||||
{
|
|
||||||
desc: "delete_succeeded",
|
|
||||||
instanceGetFails: false,
|
|
||||||
instanceState: InstanceStateDeleted,
|
|
||||||
wantErr: false,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
desc: "delete_failed",
|
desc: "delete_failed",
|
||||||
instanceGetFails: false,
|
instanceGetFails: false,
|
||||||
|
|
@ -413,16 +398,10 @@ func TestForceDeleteInstanceWaitHandler(t *testing.T) {
|
||||||
instanceState string
|
instanceState string
|
||||||
wantErr bool
|
wantErr bool
|
||||||
}{
|
}{
|
||||||
{
|
|
||||||
desc: "delete_succeeded",
|
|
||||||
instanceGetFails: false,
|
|
||||||
instanceState: InstanceStateDeleted,
|
|
||||||
wantErr: false,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
desc: "delete_failed",
|
desc: "delete_failed",
|
||||||
instanceGetFails: false,
|
instanceGetFails: false,
|
||||||
instanceState: InstanceStateFailed,
|
instanceState: InstanceStateUnknown,
|
||||||
wantErr: true,
|
wantErr: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
@ -438,7 +417,7 @@ func TestForceDeleteInstanceWaitHandler(t *testing.T) {
|
||||||
|
|
||||||
apiClient := &apiClientInstanceMocked{
|
apiClient := &apiClientInstanceMocked{
|
||||||
instanceGetFails: tt.instanceGetFails,
|
instanceGetFails: tt.instanceGetFails,
|
||||||
instanceIsForceDeleted: tt.instanceState == InstanceStateDeleted,
|
instanceIsForceDeleted: tt.instanceState == InstanceStateFailed,
|
||||||
instanceId: instanceId,
|
instanceId: instanceId,
|
||||||
instanceState: tt.instanceState,
|
instanceState: tt.instanceState,
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue