1 files changed, 9 insertions, 13 deletions
diff --git a/tests/bitrot/bug-1294786.t b/tests/bitrot/bug-1294786.t
index 4911c1dd6c2..5b4b6ddb4d3 100644
--- a/tests/bitrot/bug-1294786.t
+++ b/tests/bitrot/bug-1294786.t
@@ -16,10 +16,6 @@ function get_node_uuid {
         getfattr -n trusted.glusterfs.node-uuid --only-values $M0/FILE1 2>/dev/null
 }
 
-function get_quarantine_count {
-        ls -l "$B1/.glusterfs/quanrantine" | wc -l
-}
-
 cleanup;
 
 TEST launch_cluster 2
@@ -60,17 +56,17 @@ echo "Corrupted data" >> $B1/FILE2
 #Manually set bad-file xattr since we can't wait for an hour for scrubber.
 TEST setfattr -n trusted.bit-rot.bad-file -v 0x3100 $B1/FILE1
 TEST setfattr -n trusted.bit-rot.bad-file -v 0x3100 $B1/FILE2
-TEST touch "$B1/.glusterfs/quanrantine/$gfid1"
-TEST chmod 000 "$B1/.glusterfs/quanrantine/$gfid1"
-TEST touch "$B1/.glusterfs/quanrantine/$gfid2"
-TEST chmod 000 "$B1/.glusterfs/quanrantine/$gfid2"
-EXPECT "4" get_quarantine_count;
+TEST touch "$B1/.glusterfs/quarantine/$gfid1"
+TEST chmod 000 "$B1/.glusterfs/quarantine/$gfid1"
+TEST touch "$B1/.glusterfs/quarantine/$gfid2"
+TEST chmod 000 "$B1/.glusterfs/quarantine/$gfid2"
+EXPECT "4" get_quarantine_count "$B1";
 
 TEST $CLI_1 volume stop $V0
 TEST $CLI_1 volume start $V0
 EXPECT 'Started' volinfo_field_1 $V0 'Status';
-EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" brick_up_status_1 $V0 $H1 $B1
-EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" brick_up_status_1 $V0 $H2 $B2
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" cluster_brick_up_status 1 $V0 $H1 $B1
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" cluster_brick_up_status 1 $V0 $H2 $B2
 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_1
@@ -84,7 +80,7 @@ EXPECT "$uuid2" get_node_uuid;
 #BUG 1308961
 #Remove bad files from  mount, it should be removed from quarantine directory.
 TEST rm -f $M0/FILE1
-TEST ! stat "$B1/.glusterfs/quanrantine/$gfid1"
+TEST ! stat "$B1/.glusterfs/quarantine/$gfid1"
 
 #BUG 1308961
 #Set network.inode-lru-limit to 5 and exceed the limit by creating 10 other files.
@@ -94,6 +90,6 @@ for i in {1..10}
 do
      echo "1234" > $M0/file_$i
 done
-TEST stat "$B1/.glusterfs/quanrantine/$gfid2"
+TEST stat "$B1/.glusterfs/quarantine/$gfid2"
 
 cleanup;