Move publish and unpublish counting up in test
So as publish and unpublish are counted always
This commit is contained in:
		| @@ -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 | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Hemant Kumar
					Hemant Kumar