github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #86891 from gnufied/move-publish-unpublish-check

Browse Source 
Move publish and unpublish counting up in test
This commit is contained in:
Kubernetes Prow Robot
2020-01-08 14:45:53 -08:00
committed by GitHub
parent a233e0115b fca9963c24
commit af202d207f
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/e2e/storage/csi_mock_volume.go
View File

@@ -784,6 +784,13 @@ func checkPodLogs(cs clientset.Interface, namespace, driverPodName, driverContai
numNodeUnpublishVolume++ numNodeUnpublishVolume++
} }
} }
if numNodePublishVolume == 0 {
return fmt.Errorf("NodePublish was never called")
}
if numNodeUnpublishVolume == 0 {
return fmt.Errorf("NodeUnpublish was never called")
}
if expectPodInfo { if expectPodInfo {
if foundAttributes.Len() != len(expectedAttributes) { if foundAttributes.Len() != len(expectedAttributes) {
return fmt.Errorf("number of found volume attributes does not match, expected %d, got %d", len(expectedAttributes), foundAttributes.Len()) return fmt.Errorf("number of found volume attributes does not match, expected %d, got %d", len(expectedAttributes), foundAttributes.Len())
@@ -793,13 +800,7 @@ func checkPodLogs(cs clientset.Interface, namespace, driverPodName, driverContai
if foundAttributes.Len() != 0 { if foundAttributes.Len() != 0 {
return fmt.Errorf("some unexpected volume attributes were found: %+v", foundAttributes.List()) return fmt.Errorf("some unexpected volume attributes were found: %+v", foundAttributes.List())
} }
if numNodePublishVolume == 0 {
return fmt.Errorf("NodePublish was never called")
}
if numNodeUnpublishVolume == 0 {
return fmt.Errorf("NodeUnpublish was never called")
}
return nil return nil
} }