BIND 10 trac2252, updated. c0acd591b18839863e5c46be32daeebc07c162c4 [2252] add exceptional cases for checking initial statistics of Xfrout

[BIND 10 source code commits]

The branch, trac2252 has been updated
       via  c0acd591b18839863e5c46be32daeebc07c162c4 (commit)
       via  51be92846c3bf4881701f17e869eb9f12f9cd239 (commit)
      from  199beea87baee4dd3d4339ec20c32d0d2cb47f40 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c0acd591b18839863e5c46be32daeebc07c162c4
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Tue Apr 30 15:30:46 2013 +0900

    [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.

commit 51be92846c3bf4881701f17e869eb9f12f9cd239
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Tue Apr 30 10:49:39 2013 +0900

    [2252] update description of xfrsuccess to the same one as the man doc

-----------------------------------------------------------------------

Summary of changes:
 src/bin/xfrin/xfrin.spec                           |    2 +-
 .../xfrin/retransfer_master.conf.orig              |    3 +++
 .../xfrin/retransfer_master_v4.conf.orig           |    3 +++
 .../lettuce/features/xfrin_notify_handling.feature |   20 ++++++++++++++++----
 4 files changed, 23 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/xfrin/xfrin.spec b/src/bin/xfrin/xfrin.spec
index ea93b67..dc993f7 100644
--- a/src/bin/xfrin/xfrin.spec
+++ b/src/bin/xfrin/xfrin.spec
@@ -178,7 +178,7 @@
               "item_optional": false,
               "item_default": 0,
               "item_title": "XfrSuccess",
-              "item_description": "Number of zone transfer requests succeeded"
+              "item_description": "Number of zone transfer requests succeeded. These include the case where the zone turns out to be the latest as a result of an initial SOA query (and there is actually no AXFR or IXFR transaction)."
             },
             {
               "item_name": "xfrfail",
diff --git a/tests/lettuce/configurations/xfrin/retransfer_master.conf.orig b/tests/lettuce/configurations/xfrin/retransfer_master.conf.orig
index d7ea9a5..1b2953d 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 755c91b..35c482a 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 a2ceef6..a4e8f8e 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