4 files changed, 29 insertions, 6 deletions
diff --git a/tests/bugs/rpc/bug-1043886.t b/tests/bugs/rpc/bug-1043886.t
index e6bd45440b9..c1ea7a71e8b 100755
--- a/tests/bugs/rpc/bug-1043886.t
+++ b/tests/bugs/rpc/bug-1043886.t
@@ -3,11 +3,14 @@
 . $(dirname $0)/../../include.rc
 . $(dirname $0)/../../nfs.rc
 
+#G_TESTDEF_TEST_STATUS_CENTOS6=NFS_TEST
+
 cleanup;
 
 TEST glusterd
 TEST pidof glusterd
 TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2};
+TEST $CLI volume set $V0 nfs.disable false
 TEST $CLI volume start $V0
 
 ## Mount FUSE with caching disabled
diff --git a/tests/bugs/rpc/bug-847624.t b/tests/bugs/rpc/bug-847624.t
index 627c47b335f..fe8fc982887 100755
--- a/tests/bugs/rpc/bug-847624.t
+++ b/tests/bugs/rpc/bug-847624.t
@@ -3,6 +3,9 @@
 . $(dirname $0)/../../include.rc
 . $(dirname $0)/../../nfs.rc
 . $(dirname $0)/../../volume.rc
+
+#G_TESTDEF_TEST_STATUS_CENTOS6=NFS_TEST
+
 cleanup
 
 #1
@@ -10,6 +13,7 @@ TEST glusterd
 TEST pidof glusterd
 #3
 TEST $CLI volume create $V0 $H0:$B0/$V0
+TEST $CLI volume set $V0 nfs.disable off
 TEST $CLI volume set $V0 nfs.drc on
 TEST $CLI volume start $V0
 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available;
diff --git a/tests/bugs/rpc/bug-921072.t b/tests/bugs/rpc/bug-921072.t
index 46a3442f180..ae7eb0101bc 100755
--- a/tests/bugs/rpc/bug-921072.t
+++ b/tests/bugs/rpc/bug-921072.t
@@ -4,6 +4,8 @@
 . $(dirname $0)/../../nfs.rc
 . $(dirname $0)/../../volume.rc
 
+#G_TESTDEF_TEST_STATUS_CENTOS6=NFS_TEST
+
 cleanup;
 
 #1
@@ -11,6 +13,7 @@ TEST glusterd
 TEST pidof glusterd
 
 TEST $CLI volume create $V0 $H0:$B0/$V0
+TEST $CLI volume set $V0 nfs.disable false
 TEST $CLI volume start $V0
 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available
 TEST mount_nfs $H0:/$V0 $N0 nolock
@@ -29,7 +32,8 @@ TEST $CLI volume set $V0 nfs.rpc-auth-allow 192.168.1.1
 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available
 #11
 TEST ! mount_nfs localhost:/$V0 $N0 nolock
-TEST $CLI volume reset --mode=script $V0
+TEST $CLI volume reset $V0 force
+TEST $CLI volume set $V0 nfs.disable off
 # case 3: reject only localhost ip
 TEST $CLI volume set $V0 nfs.rpc-auth-reject 127.0.0.1
 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available
@@ -47,7 +51,8 @@ EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $N0
 
 # NEED TO CHECK BOTH IP AND NAME BASED AUTH.
 # CASES WITH NFS.ADDR-NAMELOOKUP ON (5-12)
-TEST $CLI volume reset --mode=script $V0
+TEST $CLI volume reset $V0 force
+TEST $CLI volume set $V0 nfs.disable off
 TEST $CLI volume set $V0 nfs.addr-namelookup on
 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available
 #20
@@ -68,7 +73,8 @@ EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available
 TEST ! mount_nfs localhost:/$V0 $N0 nolock
 
 # case 7: reject only localhost
-TEST $CLI volume reset --mode=script $V0
+TEST $CLI volume reset $V0 force
+TEST $CLI volume set $V0 nfs.disable off
 TEST $CLI volume set $V0 nfs.addr-namelookup on
 TEST $CLI volume set $V0 nfs.rpc-auth-reject localhost
 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available
@@ -84,7 +90,8 @@ EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $N0
 
 # based on ip addresses: repeat of cases 1-4
 # case 9: allow only localhost ip
-TEST $CLI volume reset --mode=script $V0
+TEST $CLI volume reset $V0 force
+TEST $CLI volume set $V0 nfs.disable off
 TEST $CLI volume set $V0 nfs.addr-namelookup on
 TEST $CLI volume set $V0 nfs.rpc-auth-allow 127.0.0.1
 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available
@@ -100,7 +107,8 @@ EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available
 TEST ! mount_nfs localhost:/$V0 $N0 nolock
 
 # case 11: reject only localhost ip
-TEST $CLI volume reset --mode=script $V0
+TEST $CLI volume reset $V0 force
+TEST $CLI volume set $V0 nfs.disable off
 TEST $CLI volume set $V0 nfs.addr-namelookup on
 TEST $CLI volume set $V0 nfs.rpc-auth-reject 127.0.0.1
 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available
diff --git a/tests/bugs/rpc/bug-954057.t b/tests/bugs/rpc/bug-954057.t
index 65af274f09d..40acdc2fdc7 100755
--- a/tests/bugs/rpc/bug-954057.t
+++ b/tests/bugs/rpc/bug-954057.t
@@ -25,7 +25,15 @@ TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0
 
 TEST mkdir $M0/dir
 TEST mkdir $M0/nobody
-TEST chown nfsnobody:nfsnobody $M0/nobody
+grep nfsnobody /etc/passwd > /dev/null
+if [ $? -eq 1 ]; then
+usr=nobody
+grp=nobody
+else
+usr=nfsnobody
+grp=nfsnobody
+fi
+TEST chown $usr:$grp $M0/nobody
 TEST `echo "file" >> $M0/file`
 TEST cp $M0/file $M0/new
 TEST chmod 700 $M0/new