From: Naoki Kambe Date: Wed, 13 Mar 2013 05:14:10 +0000 (+0900) Subject: [2252] remove poll-interval from stats config X-Git-Tag: bind10-1.2.0beta1-release~474^2~4^2~70 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4d94e850cc95e491ce268c9782c0eae335e7f7ea;p=thirdparty%2Fkea.git [2252] remove poll-interval from stats config and query statistics data before waiting for the log messages instead of that --- diff --git a/tests/lettuce/configurations/xfrin/retransfer_master.conf.orig b/tests/lettuce/configurations/xfrin/retransfer_master.conf.orig index 1b2953da56..d7ea9a56e2 100644 --- a/tests/lettuce/configurations/xfrin/retransfer_master.conf.orig +++ b/tests/lettuce/configurations/xfrin/retransfer_master.conf.orig @@ -33,9 +33,6 @@ "port": 47806 } ] }, - "Stats": { - "poll-interval": 1 - }, "Init": { "components": { "b10-auth": { "kind": "needed", "special": "auth" }, diff --git a/tests/lettuce/configurations/xfrin/retransfer_slave_notify.conf b/tests/lettuce/configurations/xfrin/retransfer_slave_notify.conf index 1e7e9f46f4..3040b6cf55 100644 --- a/tests/lettuce/configurations/xfrin/retransfer_slave_notify.conf +++ b/tests/lettuce/configurations/xfrin/retransfer_slave_notify.conf @@ -37,9 +37,6 @@ "class": "IN" } ] }, - "Stats": { - "poll-interval": 1 - }, "Init": { "components": { "b10-auth": { "kind": "needed", "special": "auth" }, diff --git a/tests/lettuce/features/xfrin_notify_handling.feature b/tests/lettuce/features/xfrin_notify_handling.feature index f16ad8b38d..198730e40d 100644 --- a/tests/lettuce/features/xfrin_notify_handling.feature +++ b/tests/lettuce/features/xfrin_notify_handling.feature @@ -85,11 +85,12 @@ Feature: Xfrin incoming notify handling # # wait until the last stats requesting is finished + When I query statistics zones of bind10 module Xfrout with cmdctl port 47804 wait for new master stderr message STATS_SEND_STATISTICS_REQUEST wait for new master stderr message XFROUT_RECEIVED_GETSTATS_COMMAND + last bindctl output should not contain "error" When I query statistics zones of bind10 module Xfrout with cmdctl port 47804 - last bindctl output should not contain "error" Then the statistics counter notifyoutv4 for the zone _SERVER_ should be 0 Then the statistics counter notifyoutv4 for the zone example.org. should be 0 Then the statistics counter notifyoutv6 for the zone _SERVER_ should be 5 @@ -116,11 +117,12 @@ Feature: Xfrin incoming notify handling # # wait until the last stats requesting is finished + When I query statistics zones of bind10 module Xfrin with cmdctl wait for new bind10 stderr message STATS_SEND_STATISTICS_REQUEST wait for new bind10 stderr message XFRIN_RECEIVED_GETSTATS_COMMAND + last bindctl output should not contain "error" When I query statistics zones of bind10 module Xfrin with cmdctl - last bindctl output should not contain "error" Then the statistics counter soaoutv4 for the zone _SERVER_ should be 0 Then the statistics counter soaoutv4 for the zone example.org. should be 0 Then the statistics counter soaoutv6 for the zone _SERVER_ should be 1 @@ -240,11 +242,12 @@ Feature: Xfrin incoming notify handling # # wait until the last stats requesting is finished + When I query statistics zones of bind10 module Xfrout with cmdctl port 47804 wait for new master stderr message STATS_SEND_STATISTICS_REQUEST wait for new master stderr message XFROUT_RECEIVED_GETSTATS_COMMAND + last bindctl output should not contain "error" When I query statistics zones of bind10 module Xfrout with cmdctl port 47804 - last bindctl output should not contain "error" Then the statistics counter notifyoutv4 for the zone _SERVER_ should be 0 Then the statistics counter notifyoutv4 for the zone example.org. should be 0 Then the statistics counter notifyoutv6 for the zone _SERVER_ should be 5 @@ -273,11 +276,12 @@ Feature: Xfrin incoming notify handling # # wait until the last stats requesting is finished + When I query statistics zones of bind10 module Xfrin with cmdctl wait for new bind10 stderr message STATS_SEND_STATISTICS_REQUEST wait for new bind10 stderr message XFRIN_RECEIVED_GETSTATS_COMMAND + last bindctl output should not contain "error" When I query statistics zones of bind10 module Xfrin with cmdctl - last bindctl output should not contain "error" Then the statistics counter soaoutv4 for the zone _SERVER_ should be 0 Then the statistics counter soaoutv4 for the zone example.org. should be 0 Then the statistics counter soaoutv6 for the zone _SERVER_ should be greater than 0 @@ -323,11 +327,12 @@ Feature: Xfrin incoming notify handling # # wait until the last stats requesting is finished + When I query statistics zones of bind10 module Xfrout with cmdctl port 47804 wait for new master stderr message STATS_SEND_STATISTICS_REQUEST wait for new master stderr message XFROUT_RECEIVED_GETSTATS_COMMAND + last bindctl output should not contain "error" When I query statistics zones of bind10 module Xfrout with cmdctl port 47804 - last bindctl output should not contain "error" Then the statistics counter notifyoutv4 for the zone _SERVER_ should be 0 Then the statistics counter notifyoutv4 for the zone example.org. should be 0 Then the statistics counter notifyoutv6 for the zone _SERVER_ should be greater than 0