From: Naoki Kambe <kambe@jprs.co.jp>
Date: Tue, 30 Apr 2013 06:30:46 +0000 (+0900)
Subject: [2252] add exceptional cases for checking initial statistics of Xfrout
X-Git-Tag: bind10-1.2.0beta1-release~474^2~4^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c0acd591b18839863e5c46be32daeebc07c162c4;p=thirdparty%2Fkea.git

[2252] add exceptional cases for checking initial statistics of Xfrout

.Xfrout.socket.unixdomain.open should be 1 immediately after Xfrout started.
But Stats could not have the latest statistics of Xfrout if it requests until
Xfrout is ready for accepting a statistics request from Stats.  Thus in that
case, Stats would show that .Xfrout.socket.unixdomain.open is 1.  For checking
exactly that .Xfrout.socket.unixdomain.open is 1 here, it waits for the second
time until Stats requests all modules which are Auth, Init, and Xfrout.  The
Stats configuration "poll-interval" is changed to one second so that timeout in
the lettuce test is avoided.
---

diff --git a/tests/lettuce/configurations/xfrin/retransfer_master.conf.orig b/tests/lettuce/configurations/xfrin/retransfer_master.conf.orig
index d7ea9a56e2..1b2953da56 100644
--- a/tests/lettuce/configurations/xfrin/retransfer_master.conf.orig
+++ b/tests/lettuce/configurations/xfrin/retransfer_master.conf.orig
@@ -33,6 +33,9 @@
             "port": 47806
         } ]
     },
+    "Stats": {
+        "poll-interval": 1
+    },
     "Init": {
         "components": {
             "b10-auth": { "kind": "needed", "special": "auth" },
diff --git a/tests/lettuce/configurations/xfrin/retransfer_master_v4.conf.orig b/tests/lettuce/configurations/xfrin/retransfer_master_v4.conf.orig
index 755c91b709..35c482a1a4 100644
--- a/tests/lettuce/configurations/xfrin/retransfer_master_v4.conf.orig
+++ b/tests/lettuce/configurations/xfrin/retransfer_master_v4.conf.orig
@@ -33,6 +33,9 @@
             "port": 47806
         } ]
     },
+    "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 a2ceef67e5..a4e8f8e0b7 100644
--- a/tests/lettuce/features/xfrin_notify_handling.feature
+++ b/tests/lettuce/features/xfrin_notify_handling.feature
@@ -27,7 +27,10 @@ Feature: Xfrin incoming notify handling
     #
     # Test1 for Xfrout statistics
     #
-    check initial statistics not containing example.org for Xfrout with cmdctl port 47804
+    wait for master stderr message XFROUT_RECEIVED_GETSTATS_COMMAND
+    check initial statistics not containing example.org for Xfrout with cmdctl port 47804 except for the following items
+      | item_name                | item_value |
+      | socket.unixdomain.open   |          1 |
 
     #
     # Test2 for Xfrin statistics
@@ -126,7 +129,10 @@ Feature: Xfrin incoming notify handling
     #
     # Test1 for Xfrout statistics
     #
-    check initial statistics not containing example.org for Xfrout with cmdctl port 47804
+    wait for master stderr message XFROUT_RECEIVED_GETSTATS_COMMAND
+    check initial statistics not containing example.org for Xfrout with cmdctl port 47804 except for the following items
+      | item_name                | item_value |
+      | socket.unixdomain.open   |          1 |
     #
     # Test2 for Xfrin statistics
     #
@@ -224,7 +230,10 @@ Feature: Xfrin incoming notify handling
     #
     # Test1 for Xfrout statistics
     #
-    check initial statistics not containing example.org for Xfrout with cmdctl port 47804
+    wait for master stderr message XFROUT_RECEIVED_GETSTATS_COMMAND
+    check initial statistics not containing example.org for Xfrout with cmdctl port 47804 except for the following items
+      | item_name                | item_value |
+      | socket.unixdomain.open   |          1 |
 
     #
     # Test2 for Xfrin statistics
@@ -327,7 +336,10 @@ Feature: Xfrin incoming notify handling
     #
     # Test1 for Xfrout statistics
     #
-    check initial statistics not containing example.org for Xfrout with cmdctl port 47804
+    wait for master stderr message XFROUT_RECEIVED_GETSTATS_COMMAND
+    check initial statistics not containing example.org for Xfrout with cmdctl port 47804 except for the following items
+      | item_name                | item_value |
+      | socket.unixdomain.open   |          1 |
 
     #
     # Test2 for Xfrin statistics