From 6c43efbb6b01726e450b71d274c3b45b56cc7916 Mon Sep 17 00:00:00 2001 From: Ravishankar N Date: Mon, 25 Jul 2016 19:58:01 +0530 Subject: tests: Fix get_pending_heal_count check in ec Continuation of http://review.gluster.org/#/c/14985. Also renamed tests/bugs/disperse to tests/bugs/ec for a better correlation to tests/basic/ec and xlators/cluster/ec Change-Id: I662b3477c12af8a0b94597769e8f00f354b1168c BUG: 1332054 Signed-off-by: Ravishankar N Reviewed-on: http://review.gluster.org/15006 NetBSD-regression: NetBSD Build System Smoke: Gluster Build System CentOS-regression: Gluster Build System Reviewed-by: Pranith Kumar Karampuri Reviewed-by: Xavier Hernandez --- tests/basic/ec/ec-background-heals.t | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/basic/ec') diff --git a/tests/basic/ec/ec-background-heals.t b/tests/basic/ec/ec-background-heals.t index e0fa3a1e3b2..726e60d8fea 100644 --- a/tests/basic/ec/ec-background-heals.t +++ b/tests/basic/ec/ec-background-heals.t @@ -37,7 +37,7 @@ EXPECT_WITHIN $CONFIG_UPDATE_TIMEOUT "1" mount_get_option_value $M0 $V0-disperse EXPECT_WITHIN $CONFIG_UPDATE_TIMEOUT "128" mount_get_option_value $M0 $V0-disperse-0 heal-wait-qlength #Accessing file should heal the file now EXPECT "abc" cat $M0/a -EXPECT_WITHIN $HEAL_TIMEOUT 0 get_pending_heal_count $V0 +EXPECT_WITHIN $HEAL_TIMEOUT "^0$" get_pending_heal_count $V0 #Test above test cases with reset instead of setting background-heals to 1 TEST $CLI volume set $V0 disperse.heal-wait-qlength 1024 @@ -63,7 +63,7 @@ EXPECT_WITHIN $CONFIG_UPDATE_TIMEOUT "8" mount_get_option_value $M0 $V0-disperse EXPECT_WITHIN $CONFIG_UPDATE_TIMEOUT "200" mount_get_option_value $M0 $V0-disperse-0 heal-wait-qlength #Accessing file should heal the file now EXPECT "abc" cat $M0/a -EXPECT_WITHIN $HEAL_TIMEOUT 0 get_pending_heal_count $V0 +EXPECT_WITHIN $HEAL_TIMEOUT "^0$" get_pending_heal_count $V0 #Test that disabling background-heals still drains the queue TEST $CLI volume set $V0 disperse.background-heals 1 @@ -81,7 +81,7 @@ TEST chown root:root $M0/{a,b,c,d} TEST $CLI volume set $V0 disperse.background-heals 0 EXPECT_NOT "0" mount_get_option_value $M0 $V0-disperse-0 heal-waiters TEST truncate -s 0 $M0/a # This completes the heal fast ;-) -EXPECT_WITHIN $HEAL_TIMEOUT 0 get_pending_heal_count $V0 +EXPECT_WITHIN $HEAL_TIMEOUT "^0$" get_pending_heal_count $V0 #Test that background heals get rejected on meeting background-qlen limit TEST $CLI volume set $V0 disperse.background-heals 1 -- cgit