diff options
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/bugs/error-gen/bug-767095.t | 2 | ||||
| -rw-r--r-- | tests/bugs/glusterd/bug-1111041.t | 2 | ||||
| -rwxr-xr-x | tests/bugs/glusterfs-server/bug-861542.t | 2 | ||||
| -rw-r--r-- | tests/volume.rc | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/tests/bugs/error-gen/bug-767095.t b/tests/bugs/error-gen/bug-767095.t index 34c3b182169..4649a783b23 100755 --- a/tests/bugs/error-gen/bug-767095.t +++ b/tests/bugs/error-gen/bug-767095.t @@ -31,7 +31,7 @@ TEST $CLI volume set $V0 server.statedump-path $dump_dir; TEST $CLI volume start $V0; EXPECT 'Started' volinfo_field $V0 'Status'; -TEST PID=`gluster --xml volume status patchy | grep -A 5 patchy1 | grep '<pid>' | cut -d '>' -f 2 | cut -d '<' -f 1` +TEST PID=`gluster --xml volume status patchy | grep -A 8 patchy1 | grep '<pid>' | cut -d '>' -f 2 | cut -d '<' -f 1` TEST kill -USR1 $PID; sleep 2; for file_name in $(ls $dump_dir) diff --git a/tests/bugs/glusterd/bug-1111041.t b/tests/bugs/glusterd/bug-1111041.t index 9e72c50990d..caaece0fcbb 100644 --- a/tests/bugs/glusterd/bug-1111041.t +++ b/tests/bugs/glusterd/bug-1111041.t @@ -29,7 +29,7 @@ SNAPD_PID=$(ps auxww | grep snapd | grep -v grep | awk '{print $2}'); TEST [ $SNAPD_PID -gt 0 ]; -SNAPD_PID2=$($CLI volume status $V0 | grep "Snapshot Daemon" | awk {'print $7'}); +SNAPD_PID2=$($CLI volume status $V0 | grep "Snapshot Daemon" | awk {'print $8'}); TEST [ $SNAPD_PID -eq $SNAPD_PID2 ] diff --git a/tests/bugs/glusterfs-server/bug-861542.t b/tests/bugs/glusterfs-server/bug-861542.t index ab572963bb0..d33593257b9 100755 --- a/tests/bugs/glusterfs-server/bug-861542.t +++ b/tests/bugs/glusterfs-server/bug-861542.t @@ -20,7 +20,7 @@ function port_field() if [ $opt -eq '0' ]; then $CLI volume status $vol | grep "brick0" | awk '{print $3}'; else - $CLI volume status $vol detail | grep "^Port " | awk '{print $3}'; + $CLI volume status $vol detail | grep "^TCP Port " | awk '{print $4}'; fi } diff --git a/tests/volume.rc b/tests/volume.rc index 7e8810852f5..887a9cae861 100644 --- a/tests/volume.rc +++ b/tests/volume.rc @@ -175,15 +175,15 @@ function afr_child_up_status_in_nfs { } function nfs_up_status { - gluster volume status | grep "NFS Server" | awk '{print $6}' + gluster volume status | grep "NFS Server" | awk '{print $7}' } function glustershd_up_status { - gluster volume status | grep "Self-heal Daemon" | awk '{print $6}' + gluster volume status | grep "Self-heal Daemon" | awk '{print $7}' } function quotad_up_status { - gluster volume status | grep "Quota Daemon" | awk '{print $6}' + gluster volume status | grep "Quota Daemon" | awk '{print $7}' } function get_brick_pid { |