tests: forward-porting test fixes from 3.6 branch

Change-Id: I4074e7cce8f6782860f849780ab6d0458e92a2ce
Signed-off-by: Jeff Darcy <jdarcy@fb.com>
Reviewed-on: https://review.gluster.org/17708
Smoke: Gluster Build System <jenkins@build.gluster.org>
Tested-by: Jeff Darcy <jeff@pl.atyp.us>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Jeff Darcy <jeff@pl.atyp.us>

9 files changed, 11 insertions, 3 deletions

diff --git a/tests/basic/afr/metadata-self-heal.t b/tests/basic/afr/metadata-self-heal.t
index b88c16a93e1..45bae7bdbfc 100644
--- a/tests/basic/afr/metadata-self-heal.t
+++ b/tests/basic/afr/metadata-self-heal.t
@@ -50,6 +50,7 @@ function print_pending_heals {
 TEST glusterd
 TEST pidof glusterd
 TEST $CLI volume create $V0 replica 2 $H0:$B0/brick{0,1}
+TEST $CLI volume set $V0 performance.stat-prefetch off
 TEST $CLI volume start $V0
 TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
 cd $M0
diff --git a/tests/basic/bd.t b/tests/basic/bd.t
index 63622edd709..11582db81c0 100755
--- a/tests/basic/bd.t
+++ b/tests/basic/bd.t
@@ -86,6 +86,7 @@ TEST pidof glusterd
 configure
 
 TEST $CLI volume create $V0 ${H0}:/$B0/$V0?${V0}
+TEST $CLI volume set $V0 performance.stat-prefetch off
 EXPECT "$V0" volinfo_field $V0 'Volume Name';
 EXPECT 'Created' volinfo_field $V0 'Status';
 
diff --git a/tests/basic/gfid-access.t b/tests/basic/gfid-access.t
index 19b6564e676..fc29a19fc6c 100644
--- a/tests/basic/gfid-access.t
+++ b/tests/basic/gfid-access.t
@@ -8,6 +8,7 @@ cleanup;
 TEST glusterd
 TEST pidof glusterd
 TEST $CLI volume create $V0 $H0:$B0/${V0}0
+TEST $CLI volume set $V0 performance.stat-prefetch off
 TEST $CLI volume start $V0
 TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0 --aux-gfid-mount;
 TEST mkdir $M0/a
diff --git a/tests/basic/halo-failover-enabled.t b/tests/basic/halo-failover-enabled.t
index 2dddf9951fa..7d23d80968a 100644
--- a/tests/basic/halo-failover-enabled.t
+++ b/tests/basic/halo-failover-enabled.t
@@ -65,9 +65,7 @@ TEST [ -n "$VICTIM_HAS_TEST" ]
 # brick which has the file called test.  If the both have the first
 # test file, the test is invalid as all the bricks are up and the
 # halo-max-replicas is not being honored; e.g. bug exists.
-ONLY_ONE=$((([ -z "$UP2_HAS_TEST" ] || [ -z "$UP1_HAS_TEST" ]) &&
-  ([ -n "$UP2_HAS_TEST" ] || [ -n "$UP1_HAS_TEST" ])) && echo true)
-TEST [ "x$ONLY_ONE" == "xtrue" ]
+TEST [ $([ -z "$UP1_HAS_TEST" ]) = $([ -z "$UP2_HAS_TEST" ]) ]
 
 echo "Failing child ${KILL_IDX}..."
 TEST kill_brick $V0 $H0 $B0/${V0}${KILL_IDX}
diff --git a/tests/basic/pgfid-feat.t b/tests/basic/pgfid-feat.t
index a7baeec7b7a..615a0cd867e 100644
--- a/tests/basic/pgfid-feat.t
+++ b/tests/basic/pgfid-feat.t
@@ -16,6 +16,7 @@ TEST pidof glusterd
 TEST $CLI volume info;
 
 TEST $CLI volume create $V0 replica 2  $H0:$B0/${V0}{1,2,3,4};
+TEST $CLI volume set $V0 performance.stat-prefetch off
 TEST $CLI volume set $V0 build-pgfid on;
 
 TEST $CLI volume start $V0;
diff --git a/tests/basic/quota-anon-fd-nfs.t b/tests/basic/quota-anon-fd-nfs.t
index c6b01553b02..52bce4b08aa 100755
--- a/tests/basic/quota-anon-fd-nfs.t
+++ b/tests/basic/quota-anon-fd-nfs.t
@@ -17,6 +17,7 @@ TEST pidof glusterd
 TEST $CLI volume info;
 
 TEST $CLI volume create $V0 $H0:$B0/brick1;
+TEST $CLI volume set $V0 performance.stat-prefetch off
 EXPECT 'Created' volinfo_field $V0 'Status';
 TEST $CLI volume set $V0 nfs.disable false
 
diff --git a/tests/basic/quota.t b/tests/basic/quota.t
index 17d571060e1..c902eaa1fe1 100755
--- a/tests/basic/quota.t
+++ b/tests/basic/quota.t
@@ -19,6 +19,7 @@ TEST pidof glusterd
 TEST $CLI volume info;
 
 TEST $CLI volume create $V0 replica 2  $H0:$B0/${V0}{1,2,3,4};
+TEST $CLI volume set $V0 performance.stat-prefetch off
 
 EXPECT "$V0" volinfo_field $V0 'Volume Name';
 EXPECT 'Created' volinfo_field $V0 'Status';
diff --git a/tests/basic/rpc-coverage.t b/tests/basic/rpc-coverage.t
index a76ba7084eb..b5221dcd9dd 100755..100644
--- a/tests/basic/rpc-coverage.t
+++ b/tests/basic/rpc-coverage.t
@@ -10,6 +10,7 @@ TEST pidof glusterd
 TEST $CLI volume info;
 
 TEST $CLI volume create $V0 replica 2  $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
+TEST $CLI volume set $V0 performance.stat-prefetch off
 
 EXPECT "$V0" volinfo_field $V0 'Volume Name';
 EXPECT 'Created' volinfo_field $V0 'Status';
diff --git a/tests/include.rc b/tests/include.rc
index 3573912a665..12f70e991c8 100644
--- a/tests/include.rc
+++ b/tests/include.rc
@@ -353,6 +353,7 @@ which killall > /dev/null || {
 
 which pidof > /dev/null || {
   pidof() {
+
     $PYTHON pidof.py $@
   }
 }
@@ -1167,3 +1168,5 @@ function STAT_INO()
                 echo 0
         fi
 }
+
+systemctl stop nfs-mountd