Merge pull request #1007 from chavafg/topic/fix-k8s-vol-test

k8s: tests: wait for volume to be bounded and delete pv and pvc at teardown.

Author: James O. D. Hunt

integration/kubernetes/k8s-volume.bats

@@ -25,6 +25,8 @@ setup() {
 }
 
 @test "Create Persistent Volume" {
+	wait_time=10
+	sleep_time=2
 	volume_name="pv-volume"
 	volume_claim="pv-claim"
 
@@ -38,7 +40,8 @@ setup() {
 	sudo -E kubectl create -f "${pod_config_dir}/volume-claim.yaml"
 
 	# Check the persistent volume claim
-	sudo -E kubectl get pvc $volume_claim | grep Bound
+	cmd="sudo -E kubectl get pvc $volume_claim | grep Bound"
+	waitForProcess "$wait_time" "$sleep_time" "$cmd"
 
 	# Create pod
 	sudo -E kubectl create -f "${pod_config_dir}/pv-pod.yaml"
@@ -52,5 +55,7 @@ setup() {
 
 teardown() {
 	sudo -E kubectl delete pod "$pod_name"
+	sudo -E kubectl delete pvc "$volume_claim"
+	sudo -E kubectl delete pv "$volume_name"
 	sudo rm -rf $tmp_file
 }