5 files changed, 11 insertions, 15 deletions
diff --git a/tests/bugs/bitrot/bug-1207029-bitrot-daemon-should-start-on-valid-node.t b/tests/bugs/bitrot/1209752-volume-status-should-show-bitrot-scrub-info.t
index f2c2b340e60..6101910666c 100644
--- a/tests/bugs/bitrot/bug-1207029-bitrot-daemon-should-start-on-valid-node.t
+++ b/tests/bugs/bitrot/1209752-volume-status-should-show-bitrot-scrub-info.t
@@ -10,14 +10,6 @@
 
 cleanup;
 
-function get_bitd_count_from_cli1 {
-        $CLI_1 volume status $V0 | grep "Bitrot Daemon" | grep -v grep | wc -l
-}
-
-function get_scrubd_count_from_cli2 {
-        $CLI_2 volume status $V0 | grep "Scrubber Daemon" | grep -v grep | wc -l
-}
-
 
 ## Start a 2 node virtual cluster
 TEST launch_cluster 2;
@@ -41,14 +33,19 @@ EXPECT_WITHIN $PROCESS_UP_TIMEOUT "2" get_scrubd_count
 ## daemon of all the nodes. there are 2 nodes in a cluster with having brick
 ## ${V0}1 and ${V0}2 . So there should be 2 bitrot daemon running.
 
-EXPECT_WITHIN $PROCESS_UP_TIMEOUT "2" get_bitd_count_from_cli1
+bitd=$($CLI_1 volume status $V0 | grep "Bitrot Daemon" | grep -v grep | wc -l)
+TEST [ "$bitd" -eq 2 ];
+
 
 
 ## From node 2 Gluster volume status command should show the status of Scrubber
 ## daemon of all the nodes. There are 2 nodes in a cluster with having brick
 ## ${V0}1 and ${V0}2 . So there should be 2 Scrubber daemon running.
 
-EXPECT_WITHIN $PROCESS_UP_TIMEOUT "2" get_scrubd_count_from_cli2
+scrub=$($CLI_2 volume status $V0 | grep "Scrubber Daemon" | grep -v grep | \
+        wc -l)
+TEST [ "$scrub" -eq 2 ];
+
 
 
 ## From node 1 Gluster volume status command should print status of only
diff --git a/tests/bugs/bitrot/1210684-scrub-pause-resume-error-handling.t b/tests/bugs/bitrot/bug-1210684-scrub-pause-resume-error-handling.t
index b15b908d21a..b15b908d21a 100644
--- a/tests/bugs/bitrot/1210684-scrub-pause-resume-error-handling.t
+++ b/tests/bugs/bitrot/bug-1210684-scrub-pause-resume-error-handling.t
diff --git a/tests/bugs/bitrot/bug-1227996.t b/tests/bugs/bitrot/bug-1227996.t
index 47ebc4235cf..121c7b5f279 100644
--- a/tests/bugs/bitrot/bug-1227996.t
+++ b/tests/bugs/bitrot/bug-1227996.t
@@ -17,7 +17,6 @@ TEST pidof glusterd;
 ## Lets create and start the volume
 TEST $CLI volume create $V0 $H0:$B0/${V0}0 $H0:$B0/${V0}1
 TEST $CLI volume start $V0
-
 ## Enable bitrot on volume $V0
 TEST $CLI volume bitrot $V0 enable
 
diff --git a/tests/bugs/bitrot/bug-1245981.t b/tests/bugs/bitrot/bug-1245981.t
index 2bed4d980fa..f3955256b01 100644
--- a/tests/bugs/bitrot/bug-1245981.t
+++ b/tests/bugs/bitrot/bug-1245981.t
@@ -47,9 +47,9 @@ touch $M0/5
 sleep `expr $SLEEP_TIME \* 2`
 
 backpath=$(get_backend_paths $fname)
-TEST getfattr -m . -n trusted.bit-rot.signature $backpath
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT 'trusted.bit-rot.signature' check_for_xattr 'trusted.bit-rot.signature' $backpath
 
 backpath=$(get_backend_paths $M0/new_file)
-TEST getfattr -m . -n trusted.bit-rot.signature $backpath
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT 'trusted.bit-rot.signature' check_for_xattr 'trusted.bit-rot.signature' $backpath
 
 cleanup;
diff --git a/tests/bugs/bitrot/bug-1288490.t b/tests/bugs/bitrot/bug-1288490.t
index 1d5e913cd59..5f67f4a6ec5 100644
--- a/tests/bugs/bitrot/bug-1288490.t
+++ b/tests/bugs/bitrot/bug-1288490.t
@@ -25,8 +25,8 @@ TEST setfattr -n trusted.bit-rot.bad-file -v 0x3100 $B0/brick0/FILE
 TEST $CLI volume stop $V0
 TEST $CLI volume start $V0
 EXPECT 'Started' volinfo_field $V0 'Status';
-EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" brick_up_status $V0 $H0 $B0/brick0
-EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" brick_up_status $V0 $H0 $B0/brick1
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" brick_up_status $V0 $H0 $B0/brick0
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" brick_up_status $V0 $H0 $B0/brick1
 EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 0
 EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 1
 EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" get_bitd_count