Merge pull request kubernetes#86397 from gnufied/fix-comparison-of-node-publish-unpublish

k8s-ci-robot · web-flow · commit 449fe0b1bac5 · 2019-12-20T09:09:32.000-08:00
Expect NodeUnpublish calls when NodePublish is called
diff --git a/test/e2e/storage/csi_mock_volume.go b/test/e2e/storage/csi_mock_volume.go
@@ -793,8 +793,12 @@ func checkPodLogs(cs clientset.Interface, namespace, driverPodName, driverContai
 	if foundAttributes.Len() != 0 {
 		return fmt.Errorf("some unexpected volume attributes were found: %+v", foundAttributes.List())
 	}
-	if numNodePublishVolume != numNodeUnpublishVolume {
-		return fmt.Errorf("number of NodePublishVolume %d != number of NodeUnpublishVolume %d", numNodePublishVolume, numNodeUnpublishVolume)
+	if numNodePublishVolume == 0 {
+		return fmt.Errorf("NodePublish was never called")
+	}
+
+	if numNodeUnpublishVolume == 0 {
+		return fmt.Errorf("NodeUnpublish was never called")
 	}
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -793,8 +793,12 @@ func checkPodLogs(cs clientset.Interface, namespace, driverPodName, driverContai`
`793`	`793`	`if foundAttributes.Len() != 0 {`
`794`	`794`	`return fmt.Errorf("some unexpected volume attributes were found: %+v", foundAttributes.List())`
`795`	`795`	`}`
`796`		`- if numNodePublishVolume != numNodeUnpublishVolume {`
`797`		`- return fmt.Errorf("number of NodePublishVolume %d != number of NodeUnpublishVolume %d", numNodePublishVolume, numNodeUnpublishVolume)`
	`796`	`+ if numNodePublishVolume == 0 {`
	`797`	`+ return fmt.Errorf("NodePublish was never called")`
	`798`	`+ }`
	`799`	`+`
	`800`	`+ if numNodeUnpublishVolume == 0 {`
	`801`	`+ return fmt.Errorf("NodeUnpublish was never called")`
`798`	`802`	`}`
`799`	`803`	`return nil`
`800`	`804`	`}`