From 48de09dd3856b7fa9cd1eb372170d5d39f71e0b9 Mon Sep 17 00:00:00 2001 From: Atin Mukherjee Date: Thu, 7 May 2015 10:58:46 +0530 Subject: tests : workaround fix for volume-snapshot-clone spurious failure Backport of http://review.gluster.org/#/c/10619/ Snippet of the existing test: TEST kill_glusterd 2; TEST $glusterd_2; sleep 5 EXPECT_WITHIN $PROCESS_UP_TIMEOUT 'Started' volinfo_field ${V0}_clone 'Status'; EXPECT_WITHIN $PROCESS_UP_TIMEOUT 'Started' volinfo_field ${V1}_clone 'Status'; stop_force_volumes 2 The above EXPECT_WITHINs will not wait as the volumes were never stopped which results into immediate trigger of volume stop where handshaking is not completed. A workaround would be to check whether handshaking is completed and then proceed. Change-Id: Id3468b56f801212fc8e19ff196bc99e5e2358471 BUG: 1220012 Signed-off-by: Atin Mukherjee Reviewed-on: http://review.gluster.org/10619 Tested-by: Gluster Build System Reviewed-by: Jeff Darcy Reviewed-by: Justin Clift Reviewed-by: Niels de Vos (cherry picked from commit 0950e6c29fc51ddcc5bb7e1e4187d54ff7c171d2) Reviewed-on: http://review.gluster.org/10700 Reviewed-by: Vijay Bellur --- tests/basic/volume-snapshot-clone.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/basic/volume-snapshot-clone.t b/tests/basic/volume-snapshot-clone.t index 17e51d91a81..7c0ec7e0f5a 100755 --- a/tests/basic/volume-snapshot-clone.t +++ b/tests/basic/volume-snapshot-clone.t @@ -92,7 +92,7 @@ EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M1 TEST kill_glusterd 2; TEST $glusterd_2; -sleep 5 +EXPECT_WITHIN $PROBE_TIMEOUT 2 peer_count; EXPECT_WITHIN $PROCESS_UP_TIMEOUT 'Started' volinfo_field ${V0}_clone 'Status'; EXPECT_WITHIN $PROCESS_UP_TIMEOUT 'Started' volinfo_field ${V1}_clone 'Status'; -- cgit