Regression test portability: mount

Address various portability-related problems related to mount
- In order to address the non-portability of NFS mount options,
  use the mount_nfs shell function everywhere, and use it to
  translate options.
- Make sure NFS mounts are unmounted before shutting down the
  daemons in order to avoid deadlock. The change is done in every
  test that did not unmounted NFS mounts at the end of the script,
  and in global cleanup function as well. The force_umount shell
  function from volume.rc was duplicated as umount_nfs in nfs.rc
  so that we do not have to add an include on volume.rc for all
  NFS tests that do not need it.
- The FUSE mount type on NetBSD is puffs|perfuse|fuse.glusterfs
  instead of just fuse.glusterfs, make the regexp configurable
  in include.rc
- Finding wether the mount is RO or RW in mount output needs
  a system-dependent command configurable in include.rc
- mount options in /proc/mounts may be limited to "rw", adjust
  the regexp for this case where there is no comma

And while there change rm into rm -f in tests/basic/mount.t
for removal opearation that should fail, since rm may ask
for confirmation

Change-Id: I1fb708486ec350b2885e2404879561c1020fa8fd
BUG: 1129939
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.org/8494
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Harshavardhana <harsha@harshavardhana.net>
Tested-by: Harshavardhana <harsha@harshavardhana.net>

1 files changed, 6 insertions, 1 deletions

diff --git a/tests/basic/volume-status.t b/tests/basic/volume-status.t
index a91db3cc50a..9b636cfa936 100644
--- a/tests/basic/volume-status.t
+++ b/tests/basic/volume-status.t
@@ -2,6 +2,7 @@
 
 . $(dirname $0)/../include.rc
 . $(dirname $0)/../volume.rc
+. $(dirname $0)/../nfs.rc
 
 cleanup;
 
@@ -19,7 +20,7 @@ sleep 2
 TEST glusterfs -s $H0 --volfile-id $V0 $M0;
 
 ## Mount NFS
-TEST mount -t nfs -o vers=3,nolock,soft,intr $H0:/$V0 $N0;
+TEST mount_nfs $H0:/$V0 $N0 nolock;
 
 TEST $CLI volume status all
 TEST $CLI volume status $V0
@@ -62,5 +63,9 @@ TEST test_shd_cmds;
 TEST test_nfs_cmds;
 TEST test_brick_cmds;
 
+
+## Before killing daemon to avoid deadlocks
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
+
 cleanup;