[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 1b2953da56f1e66c66d7d90a2a8653c86fe84027..d7ea9a56e2e4a9b17b3584f5db701d6d85750967 100644 (file)
--- 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 1e7e9f46f450d7493cbc41fc70ce7f7a947b27f4..3040b6cf55c981b95d0c88109aa7cff630979d92 100644 (file)
--- 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 f16ad8b38d9ba80dc5c9f0b9f2171fd1113cd61a..198730e40d8486d4a3a70dd35fc4265e3c77863d 100644 (file)
--- 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