diff options
Diffstat (limited to 'tests/features')
| -rwxr-xr-x | tests/features/trash.t | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/tests/features/trash.t b/tests/features/trash.t index 268baac570f..620b84f0da1 100755 --- a/tests/features/trash.t +++ b/tests/features/trash.t @@ -93,11 +93,6 @@ wildcard_not_exists() { if [ $? -eq 0 ]; then echo "Y"; else echo "N"; fi } -heal_ready() { - $CLI volume heal $1 info | grep -q '^Brick' - if [ $? -eq 0 ]; then echo "Y"; else echo "N"; fi -} - # testing glusterd [1-3] TEST glusterd TEST pidof glusterd @@ -227,26 +222,23 @@ EXPECT_WITHIN ${PROCESS_UP_TIMEOUT} "1" online_brick_count rm -f $M1/self EXPECT "Y" wildcard_exists $B0/${V1}2/.trashcan/self* -# force start the volume and trigger the self-heal manually [55-59] +# force start the volume and trigger the self-heal manually [55-57] TEST $CLI volume start $V1 force EXPECT_WITHIN $PROCESS_UP_TIMEOUT "2" online_brick_count EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" glustershd_up_status -# volume heal one sometimes fail with "Launching heal operation to -# perform index self heal on volume patchy1 has been unsuccessful" -# Hence firt check heal is really functionnal. -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" heal_ready $V1 -TEST $CLI volume heal $V1 +# Since we created the file under root of the volume, it will be +# healed automatically -# check for the removed file in trashcan [60] +# check for the removed file in trashcan [58] EXPECT_WITHIN $HEAL_TIMEOUT "Y" wildcard_exists $B0/${V1}1/.trashcan/internal_op/self* -# check renaming of trash directory through cli [61-64] +# check renaming of trash directory through cli [59-62] TEST $CLI volume set $V0 trash-dir abc TEST start_vol $V0 $M0 $M0/abc TEST [ -e $M0/abc -a ! -e $M0/.trashcan ] EXPECT "Y" wildcard_exists $B0/${V0}1/abc/internal_op/rebal2* -# ensure that rename and delete operation on trash directory fails [65-67] +# ensure that rename and delete operation on trash directory fails [63-65] rm -rf $M0/abc/internal_op TEST [ -e $M0/abc/internal_op ] rm -rf $M0/abc/ |