summaryrefslogtreecommitdiffstats
path: root/tests/include.rc
diff options
context:
space:
mode:
authorPranith Kumar K <pkarampu@redhat.com>2015-05-01 21:51:09 +0530
committerPranith Kumar Karampuri <pkarampu@redhat.com>2015-05-05 23:02:17 -0700
commit94e5f4bf6555fd102dcc15e3b91685d7728cd064 (patch)
tree38d7e9d610c8b433e9b0313040b525f986e62e21 /tests/include.rc
parent044adf7becfcb5ad5f2d9cf5f9922930d355c510 (diff)
tests: Fix spurious failures
Backport of: http://review.gluster.org/10480 http://review.gluster.org/10487 http://review.gluster.org/10488 http://review.gluster.com/10540 - Use REBALANCE_TIMEOUT in EXPECT_WITHIN - Use fdatasync to prevent write - behind from giving success - Add logfile to glupy - Check aux umount is unmounted for quota tests - Disable flush behind so that file will be closed Change-Id: Ia2447176273557738b7a71cc25dd9b9effc16d58 BUG: 1218485 Signed-off-by: Pranith Kumar K <pkarampu@redhat.com> Reviewed-on: http://review.gluster.org/10543 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'tests/include.rc')
-rw-r--r--tests/include.rc3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/include.rc b/tests/include.rc
index d4772bd42f4..569e0db7e03 100644
--- a/tests/include.rc
+++ b/tests/include.rc
@@ -387,6 +387,9 @@ function cleanup()
done
killall -15 glusterfs glusterfsd glusterd 2>/dev/null || true;
+ for m in `mount | grep fuse.glusterfs | awk '{print $3}'`; do
+ umount $m
+ done
test x"$OSTYPE" = x"NetBSD" && pkill -15 perfused rpc.statd || true
# allow completion of signal handlers for SIGTERM before issue SIGKILL
sleep 1