From 78d481a2a9811f789acfca0f2eed123e8857601a Mon Sep 17 00:00:00 2001 From: Pawan Date: Thu, 26 Mar 2020 20:02:03 +0530 Subject: [PATCH] fix(test): fixing resize flaky test case We are comparing the desired size to the wrong field because of that resize test is not executing correctly and sometimes causing test case failure in travis. The update call is failing sometimes while executing the zfs property update test cases as for resize also the object is getting modified. The test case will fail when object updation happens between volume GET and UPDATE call while performing zfs property update test case to set various properties on ZFSVolume resource. Signed-off-by: Pawan --- ci/ci-test.sh | 2 +- tests/utils.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/ci-test.sh b/ci/ci-test.sh index fa414802d..1809bb5e3 100755 --- a/ci/ci-test.sh +++ b/ci/ci-test.sh @@ -75,7 +75,7 @@ echo "get all the pods" kubectl get pods -owide --all-namespaces echo "get pvc and pv details" -kubectl get pvc,pv --all-namespaces +kubectl get pvc,pv -oyaml --all-namespaces echo "get sc details" kubectl get sc --all-namespaces -oyaml diff --git a/tests/utils.go b/tests/utils.go index 3580f3fb4..766df873f 100644 --- a/tests/utils.go +++ b/tests/utils.go @@ -51,7 +51,7 @@ func IsPVCBoundEventually(pvcName string) bool { // IsPVCResizedEventually checks if the pvc is bound or not eventually func IsPVCResizedEventually(pvcName string, newCapacity string) bool { - newStorage, err := resource.ParseQuantity(NewCapacity) + newStorage, err := resource.ParseQuantity(newCapacity) if err != nil { return false } @@ -59,10 +59,10 @@ func IsPVCResizedEventually(pvcName string, newCapacity string) bool { volume, err := PVCClient. Get(pvcName, metav1.GetOptions{}) Expect(err).ShouldNot(HaveOccurred()) - pvcStorage := volume.Spec.Resources.Requests[corev1.ResourceName(corev1.ResourceStorage)] + pvcStorage := volume.Status.Capacity[corev1.ResourceName(corev1.ResourceStorage)] return pvcStorage == newStorage }, - 60, 5). + 120, 5). Should(BeTrue()) }