Move error check ahead

mowangdk · mowangdk · commit 2eeaebca2482 · 2024-07-23T16:13:47.000+08:00
diff --git a/test/e2e/storage/csimock/csi_node_volume_health.go b/test/e2e/storage/csimock/csi_node_volume_health.go
@@ -127,6 +127,7 @@ var _ = utils.SIGDescribe("CSI Mock Node Volume Health", feature.CSIVolumeHealth
 					}
 					return false, nil
 				})
+				framework.ExpectNoError(err, "while waiting for all CSI calls")
 				// try to use ```csi.NewMetricsCsi(pv.handler).GetMetrics()``` to get metrics from csimock driver but failed.
 				// the mocked csidriver register doesn't regist itself to normal csidriver.
 				if test.nodeVolumeConditionRequired {
@@ -150,7 +151,6 @@ var _ = utils.SIGDescribe("CSI Mock Node Volume Health", feature.CSIVolumeHealth
 					})
 					framework.ExpectNoError(waitErr, "call metrics should not have any error")
 				}
-				framework.ExpectNoError(err, "while waiting for all CSI calls")
 			})
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,7 @@ var _ = utils.SIGDescribe("CSI Mock Node Volume Health", feature.CSIVolumeHealth`
`127`	`127`	`}`
`128`	`128`	`return false, nil`
`129`	`129`	`})`
	`130`	`+ framework.ExpectNoError(err, "while waiting for all CSI calls")`
`130`	`131`	// try to use ```csi.NewMetricsCsi(pv.handler).GetMetrics()``` to get metrics from csimock driver but failed.
`131`	`132`	`// the mocked csidriver register doesn't regist itself to normal csidriver.`
`132`	`133`	`if test.nodeVolumeConditionRequired {`
`@@ -150,7 +151,6 @@ var _ = utils.SIGDescribe("CSI Mock Node Volume Health", feature.CSIVolumeHealth`
`150`	`151`	`})`
`151`	`152`	`framework.ExpectNoError(waitErr, "call metrics should not have any error")`
`152`	`153`	`}`
`153`		`- framework.ExpectNoError(err, "while waiting for all CSI calls")`
`154`	`154`	`})`
`155`	`155`	`}`
`156`	`156`