summaryrefslogtreecommitdiffstats
path: root/tests/basic/quota-nfs.t
diff options
context:
space:
mode:
authorvmallika <vmallika@redhat.com>2015-09-01 14:21:43 +0530
committerJeff Darcy <jdarcy@redhat.com>2015-09-03 08:23:59 -0700
commit76233f0cf43125a83b79de3ca5dc742fc9850cce (patch)
tree8c108a498a505a81cdacfb6d7cc0de2c3d26db9b /tests/basic/quota-nfs.t
parentb5fff7326e9203c650eb5d395bc5a338075821f1 (diff)
test: fix spurious failure from ./tests/basic/quota-nfs.t
Before checking for the quota usage, umount and mount NFS mountpoint to flush the NFS cached data. This test is fails on NetBSD, so marking the test as bad-test Change-Id: I1f30f5d9a919b3959c9f158366bd2f47569c8e03 BUG: 1258766 Signed-off-by: vmallika <vmallika@redhat.com> Reviewed-on: http://review.gluster.org/12075 Tested-by: NetBSD Build System <jenkins@build.gluster.org> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Manikandan Selvaganesh <mselvaga@redhat.com> Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Diffstat (limited to 'tests/basic/quota-nfs.t')
-rwxr-xr-xtests/basic/quota-nfs.t14
1 files changed, 13 insertions, 1 deletions
diff --git a/tests/basic/quota-nfs.t b/tests/basic/quota-nfs.t
index f295aaee79b..00c76a49f56 100755
--- a/tests/basic/quota-nfs.t
+++ b/tests/basic/quota-nfs.t
@@ -17,6 +17,7 @@ TEST $CLI volume create $V0 $H0:$B0/brick1;
EXPECT 'Created' volinfo_field $V0 'Status';
TEST $CLI volume set $V0 network.inode-lru-limit 1
+TEST $CLI volume set $V0 performance.nfs.write-behind off
TEST $CLI volume start $V0;
EXPECT 'Started' volinfo_field $V0 'Status';
@@ -34,6 +35,17 @@ TEST $CLI volume quota $V0 soft-timeout 0
TEST $CLI volume quota $V0 hard-timeout 0
TEST $QDD $N0/$deep/newfile_1 256 20
+
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" STAT $N0/$deep/file
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" STAT $N0/$deep/newfile_1
+
+#Unmount and mount to flush the data
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
+TEST mount_nfs $H0:/$V0 $N0
+
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" STAT $N0/$deep/file
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" STAT $N0/$deep/newfile_1
+
# wait for write behind to complete.
EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "15.0MB" quotausage "/"
@@ -42,7 +54,7 @@ TEST ! $QDD $N0/$deep/newfile_2 256 400
TEST rm -f $N0/$deep/newfile_2
## Before killing daemon to avoid deadlocks
-umount_nfs $N0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
TEST $CLI volume stop $V0
EXPECT "1" get_aux