diff options
author | Atin Mukherjee <amukherj@redhat.com> | 2015-05-07 10:58:46 +0530 |
---|---|---|
committer | Vijay Bellur <vbellur@redhat.com> | 2015-05-09 02:16:49 -0700 |
commit | 48de09dd3856b7fa9cd1eb372170d5d39f71e0b9 (patch) | |
tree | 0cade5452bae9bed5c8e74c56c41e0e4ce371cc1 /tests | |
parent | c466b137b0cabb844ce7a1f92549ff9b72369830 (diff) |
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 <amukherj@redhat.com>
Reviewed-on: http://review.gluster.org/10619
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Reviewed-by: Justin Clift <justin@gluster.org>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
(cherry picked from commit 0950e6c29fc51ddcc5bb7e1e4187d54ff7c171d2)
Reviewed-on: http://review.gluster.org/10700
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/basic/volume-snapshot-clone.t | 2 |
1 files changed, 1 insertions, 1 deletions
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'; |