From 8b2695fb1a81916aed3aa2e9726c5cdc6501c5ef Mon Sep 17 00:00:00 2001 From: Chin-Ya Huang Date: Fri, 24 Nov 2023 12:34:26 +0800 Subject: [PATCH] refactor(negative): Wait until all replicas rebuilt ref: 7034 Signed-off-by: Chin-Ya Huang --- e2e/keywords/volume.resource | 8 +++----- e2e/tests/replica_rebuilding.robot | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/e2e/keywords/volume.resource b/e2e/keywords/volume.resource index 77c2cfd773..8a090f4540 100644 --- a/e2e/keywords/volume.resource +++ b/e2e/keywords/volume.resource @@ -31,6 +31,9 @@ Wait until volume ${volume_name} replica rebuilding started on ${replica_node_ty Wait until volume ${volume_name} replica rebuilding completed on ${replica_node_type} wait_for_replica_rebuilding_to_complete_on_node ${volume_name} ${replica_node_type} +Wait until volume ${volume_name} replicas rebuilding completed + wait_for_replica_rebuilding_to_complete ${volume_name} + Check volume ${volume_name} data is intact check_data_checksum ${volume_name} @@ -39,8 +42,3 @@ Check volume ${volume_name} works #TODO # write data to a file in the volume instead of writing /dev/longhorn/vol-name # so the data won't be overwritten and we can compare the checksum - -Wait until all replicas rebuilt - wait_for_replica_rebuilding_complete ${volume_name} 0 - wait_for_replica_rebuilding_complete ${volume_name} 1 - wait_for_replica_rebuilding_complete ${volume_name} 2 diff --git a/e2e/tests/replica_rebuilding.robot b/e2e/tests/replica_rebuilding.robot index 37e85fbaab..071ec02406 100644 --- a/e2e/tests/replica_rebuilding.robot +++ b/e2e/tests/replica_rebuilding.robot @@ -25,7 +25,7 @@ Delete Replica While Replica Rebuilding And Delete volume lhv-0 replica on test pod node Then Check volume lhv-0 data is intact - And Wait until all replicas rebuilt + And Wait until volume lhv-0 replicas rebuilding completed END Reboot Volume Node While Replica Rebuilding