[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 d7ea9a56e2e4a9b17b3584f5db701d6d85750967..1b2953da56f1e66c66d7d90a2a8653c86fe84027 100644 (file)
--- 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 755c91b7095e7f203fca7e6d8824baa6fc6be1bb..35c482a1a4363a7f7bd81cdb7027640090826395 100644 (file)
--- 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 a2ceef67e5fa48076e437356d953b9520e5cc171..a4e8f8e0b78774238a4925b7609d70fa1bc4d503 100644 (file)
--- 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