From 473f115cbf18dd5229636c817d49b2c60471e227 Mon Sep 17 00:00:00 2001
From: Emmanuel Dreyfus <manu@netbsd.org>
Date: Tue, 19 Aug 2014 17:55:46 +0200
Subject: 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>
---
 tests/bugs/bug-1043886.t | 3 +++
 tests/bugs/bug-1070734.t | 3 +++
 tests/bugs/bug-867253.t  | 2 +-
 tests/bugs/bug-887145.t  | 2 ++
 tests/bugs/bug-927616.t  | 2 ++
 5 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'tests/bugs')

diff --git a/tests/bugs/bug-1043886.t b/tests/bugs/bug-1043886.t
index 9a125c2de2c..710fcd2064d 100755
--- a/tests/bugs/bug-1043886.t
+++ b/tests/bugs/bug-1043886.t
@@ -46,6 +46,9 @@ TEST [ "$(stat -c %u:%g $N0/other/file)" = "$uid:$gid" ];
 TEST mkdir $M0/other/dir 2>/dev/null;
 TEST [ "$(stat -c %u:%g $N0/other/dir)" = "$uid:$gid" ];
 
+## Before killing daemon to avoid deadlocks
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
+
 TEST $CLI volume stop $V0;
 TEST $CLI volume delete $V0;
 
diff --git a/tests/bugs/bug-1070734.t b/tests/bugs/bug-1070734.t
index fd7bbe01cf6..3928983c345 100755
--- a/tests/bugs/bug-1070734.t
+++ b/tests/bugs/bug-1070734.t
@@ -68,4 +68,7 @@ TEST [ -f ${OTHERBRICK}/DIR/file ]
 EXPECT "0x00000001000000000000000000000000" dht_get_layout $HASHED/DIR ;
 EXPECT "0x000000010000000000000000ffffffff" dht_get_layout $OTHERBRICK/DIR;
 
+## Before killing daemon to avoid deadlocks
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
+
 cleanup
diff --git a/tests/bugs/bug-867253.t b/tests/bugs/bug-867253.t
index 6b0332959e9..47c194b4b52 100644
--- a/tests/bugs/bug-867253.t
+++ b/tests/bugs/bug-867253.t
@@ -30,7 +30,7 @@ TEST $CLI volume start $V0
 
 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available;
 ## Mount nfs, with nocache option
-TEST mount -o vers=3,nolock,noac -t nfs $H0:/$V0 $M0;
+TEST mount_nfs $H0:/$V0 $M0 nolock,noac;
 
 touch $M0/files{1..1000};
 
diff --git a/tests/bugs/bug-887145.t b/tests/bugs/bug-887145.t
index ee19036e0c1..554e6ce95d6 100755
--- a/tests/bugs/bug-887145.t
+++ b/tests/bugs/bug-887145.t
@@ -80,6 +80,8 @@ TEST [ $? -ne 0 ]
 userdel tmp_user;
 rm -rf /home/tmp_user;
 
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
+
 TEST $CLI volume stop $V0;
 TEST $CLI volume delete $V0;
 
diff --git a/tests/bugs/bug-927616.t b/tests/bugs/bug-927616.t
index 58f961dc80a..4525ddbb747 100755
--- a/tests/bugs/bug-927616.t
+++ b/tests/bugs/bug-927616.t
@@ -54,6 +54,8 @@ TEST [ $? -eq 0 ]
 mkdir $N0/old 2>/dev/null;
 TEST [ $? -eq 0 ]
 
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
+
 TEST $CLI volume stop $V0;
 TEST $CLI volume delete $V0;
 
-- 
cgit