Merge branch 'issue10346' into 'master'

gitlab · gitlab · commit 42064e8027bb · 2018-03-25T22:28:44.000+08:00
fix case APIAttachAndDeleleEipCase

Closes ZSTAC-10346 and ZSTACK-10346

See merge request zstackio/zstack!2409
diff --git a/test/src/test/groovy/org/zstack/test/integration/networkservice/provider/virtualrouter/eip/AttachAndDeleteEipCase.groovy b/test/src/test/groovy/org/zstack/test/integration/networkservice/provider/virtualrouter/eip/AttachAndDeleteEipCase.groovy
@@ -266,7 +266,7 @@ class AttachAndDeleteEipCase extends SubCase{
             }
         }
 
-        retryInSecs(2, 1){
+        retryInSecs(3, 1){
             assert Q.New(VmInstanceVO.class).eq(VmInstanceVO_.uuid, vm.uuid)
                     .eq(VmInstanceVO_.state, VmInstanceState.Pausing).exists
         }
@@ -312,7 +312,7 @@ class AttachAndDeleteEipCase extends SubCase{
             }
         }
 
-        retryInSecs(2, 1){
+        retryInSecs(5, 1){
             assert Q.New(VmInstanceVO.class).eq(VmInstanceVO_.uuid, vm.uuid)
                     .eq(VmInstanceVO_.state, VmInstanceState.VolumeMigrating).exists
         }

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ class AttachAndDeleteEipCase extends SubCase{`
`266`	`266`	`}`
`267`	`267`	`}`
`268`	`268`
`269`		`- retryInSecs(2, 1){`
	`269`	`+ retryInSecs(3, 1){`
`270`	`270`	`assert Q.New(VmInstanceVO.class).eq(VmInstanceVO_.uuid, vm.uuid)`
`271`	`271`	`.eq(VmInstanceVO_.state, VmInstanceState.Pausing).exists`
`272`	`272`	`}`
`@@ -312,7 +312,7 @@ class AttachAndDeleteEipCase extends SubCase{`
`312`	`312`	`}`
`313`	`313`	`}`
`314`	`314`
`315`		`- retryInSecs(2, 1){`
	`315`	`+ retryInSecs(5, 1){`
`316`	`316`	`assert Q.New(VmInstanceVO.class).eq(VmInstanceVO_.uuid, vm.uuid)`
`317`	`317`	`.eq(VmInstanceVO_.state, VmInstanceState.VolumeMigrating).exists`
`318`	`318`	`}`