tests: Backport all changes to tests dir

Test framework should be the same on all the branches. This is a copy
of all the files under tests dir from master branch. New tests in
master have not been backported, but changes to existing tests have
been.

Change-Id: I75747c525aabbd9247473dd29b3a0e7a7d93c827
BUG: 1316533
Signed-off-by: Raghavendra Talur <rtalur@redhat.com>
Reviewed-on: http://review.gluster.org/13683
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>

1 files changed, 6 insertions, 3 deletions

diff --git a/tests/volume.rc b/tests/volume.rc
index 19848bca883..e488aa73b1c 100644
--- a/tests/volume.rc
+++ b/tests/volume.rc
@@ -30,8 +30,7 @@ function brick_up_status {
         local vol=$1
         local host=$2
         local brick=$3
-        brick_pid=$(get_brick_pid $vol $host $brick)
-        gluster volume status | grep $brick_pid | awk '{print $4}'
+        $CLI volume status $vol $host:$brick --xml | sed -ne 's/.*<status>\([01]\)<\/status>/\1/p'
 }
 
 function volume_option()
@@ -50,6 +49,10 @@ function rebalance_status_field {
         $CLI volume rebalance $1 status | awk '{print $7,$8,$9}' |sed -n 3p |tr -d '[^0-9+\.]'|sed 's/ *$//g'
 }
 
+function detach_tier_status_field {
+        $CLI volume tier  $1 detach status | awk '{print $7,$8,$9}' |sed -n 3p |tr -d '[^0-9+\.]'|sed 's/ *$//g'
+}
+
 function remove_brick_status_completed_field {
         local vol=$1
         local brick_list=$2
@@ -464,7 +467,7 @@ function path_exists {
 }
 
 function force_umount {
-        umount -f $*
+        ${UMOUNT_F} $*
         if [ $? -eq 0 ]; then echo "Y"; else echo "N"; fi
 }