fix: adjust wait timeouts
chore: cleanup [skip ci]
This commit is contained in:
parent
c0047cd5ec
commit
3682d40a05
3 changed files with 5 additions and 21 deletions
2
.github/workflows/ci_new.yaml
vendored
2
.github/workflows/ci_new.yaml
vendored
|
|
@ -225,7 +225,7 @@ jobs:
|
||||||
export TF_ACC_SERVICE_ACCOUNT_FILE
|
export TF_ACC_SERVICE_ACCOUNT_FILE
|
||||||
make test
|
make test
|
||||||
|
|
||||||
- name: Testing
|
- name: Testing with coverage
|
||||||
if: ${{ github.event_name == 'pull_request' }}
|
if: ${{ github.event_name == 'pull_request' }}
|
||||||
run: |
|
run: |
|
||||||
TF_ACC_SERVICE_ACCOUNT_FILE=~/.service_account.json
|
TF_ACC_SERVICE_ACCOUNT_FILE=~/.service_account.json
|
||||||
|
|
|
||||||
|
|
@ -493,7 +493,10 @@ func (r *instanceResource) Update(
|
||||||
projectID,
|
projectID,
|
||||||
region,
|
region,
|
||||||
instanceID,
|
instanceID,
|
||||||
).WaitWithContext(ctx)
|
).
|
||||||
|
SetTimeout(30 * time.Minute).
|
||||||
|
SetSleepBeforeWait(10 * time.Second).
|
||||||
|
WaitWithContext(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
core.LogAndAddError(
|
core.LogAndAddError(
|
||||||
ctx,
|
ctx,
|
||||||
|
|
|
||||||
|
|
@ -151,27 +151,8 @@ func TestAccInstance(t *testing.T) {
|
||||||
updNetACL := updBackupSched
|
updNetACL := updBackupSched
|
||||||
updNetACL.ACLStrings = append(updNetACL.ACLStrings, "192.168.0.0/24")
|
updNetACL.ACLStrings = append(updNetACL.ACLStrings, "192.168.0.0/24")
|
||||||
|
|
||||||
/*
|
|
||||||
{
|
|
||||||
"flavorId": "1.2",
|
|
||||||
"network": {
|
|
||||||
"acl": [
|
|
||||||
"198.51.100.0/24"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"replicas": 1,
|
|
||||||
"retentionDays": 35,
|
|
||||||
"storage": {
|
|
||||||
"size": 10
|
|
||||||
},
|
|
||||||
"version": "string"
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
testItemID := testutils.ResStr(pfx, "instance", exData.TfName)
|
testItemID := testutils.ResStr(pfx, "instance", exData.TfName)
|
||||||
|
|
||||||
compareValuesSame := statecheck.CompareValue(compare.ValuesSame())
|
compareValuesSame := statecheck.CompareValue(compare.ValuesSame())
|
||||||
|
|
||||||
resource.ParallelTest(
|
resource.ParallelTest(
|
||||||
t, resource.TestCase{
|
t, resource.TestCase{
|
||||||
PreCheck: func() {
|
PreCheck: func() {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue