BIND 10 master, updated. 8bc72c0e77a786901f61f3fab7aa0074aa1c5b70 [stats_lettuce_fix] added configuration of stats

[BIND 10 source code commits]

The branch, master has been updated
       via  8bc72c0e77a786901f61f3fab7aa0074aa1c5b70 (commit)
       via  583710591b610e704fd5739be4a4106917e35e9e (commit)
       via  54ad8dd54acc965dc75513b739d604e74b4a11ee (commit)
       via  64ce8ec302fd2f7afb3ece6b74e4a9b4ce127a7d (commit)
       via  14727f8945873937f353915eac0e918cdb58721f (commit)
      from  8e8f94c6320e47ff7856ceed21e5da31c614443b (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 8bc72c0e77a786901f61f3fab7aa0074aa1c5b70
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Thu Sep 20 15:14:11 2012 +0900

    [stats_lettuce_fix] added configuration of stats
    
    Changed the default time (60sec) of poll-interval to one second.  This is
    because it's so infrequent for lettuce test of stats.

commit 583710591b610e704fd5739be4a4106917e35e9e
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Thu Sep 20 15:05:28 2012 +0900

    [stats_lettuce_fix] fix for the lettuce error: Not found statistics counter notifyoutv4
    
    http://git.bind10.isc.org/~tester/builder//BIND10-lettuce/20120918121701-DebianLinux-x86_64-GCC/logs/lettuce.out
      AssertionError: Not found statistics counter notifyoutv4 for zone example.org.
    
    Added waiting until the last requesting is finished instead of one-second
    sleep. It should be done before checking the result of "Stats show" command via
    bindctl.

commit 54ad8dd54acc965dc75513b739d604e74b4a11ee
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Thu Sep 20 14:54:37 2012 +0900

    Revert "[stats_lettuce_fix] fix for the lettuce error: Not found statistics counter notifyoutv4"
    
    This reverts commit 14727f8945873937f353915eac0e918cdb58721f.

commit 64ce8ec302fd2f7afb3ece6b74e4a9b4ce127a7d
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Thu Sep 20 13:56:08 2012 +0900

    [stats_lettuce_fix] fix for the lettuce error: AssertionError: Got 3, expected less than 3 as counter xfrrej
    
    http://git.bind10.isc.org/~tester/builder/BIND10-lettuce/20120918210000-MacOS/logs/lettuce.out
      AssertionError: Got 3, expected less than 3 as counter xfrrej for zone _SERVER_
    
    Removed the upper limits of the counter xfrrej. Because a xfer request might be
    rejected greater than 3 times. This number of times might depend on something
    like the environment or the platform or the rasing condition, where this
    lettuce test is running.

commit 14727f8945873937f353915eac0e918cdb58721f
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Thu Sep 20 13:34:15 2012 +0900

    [stats_lettuce_fix] fix for the lettuce error: Not found statistics counter notifyoutv4
    
    http://git.bind10.isc.org/~tester/builder//BIND10-lettuce/20120918121701-DebianLinux-x86_64-GCC/logs/lettuce.out
      AssertionError: Not found statistics counter notifyoutv4 for zone example.org.
    
    It has to wait at least for one second since the query to
    b10-stats. b10-stats doesn't request to other module, e.g. b10-xfrout,
    for less than one second, even if show command is invoked via
    bindctl. This is for avoiding too frequent requests to b10-stats.

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

Summary of changes:
 .../xfrin/retransfer_master.conf.orig              |    3 +++
 .../lettuce/features/xfrin_notify_handling.feature |   14 ++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/tests/lettuce/configurations/xfrin/retransfer_master.conf.orig b/tests/lettuce/configurations/xfrin/retransfer_master.conf.orig
index b0e3ac0..c04d917 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
+    },
     "Boss": {
         "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 96a9721..5f28cdf 100644
--- a/tests/lettuce/features/xfrin_notify_handling.feature
+++ b/tests/lettuce/features/xfrin_notify_handling.feature
@@ -49,9 +49,13 @@ Feature: Xfrin incoming notify handling
     #
     # check for statistics change
     #
+
+    # wait until the last stats requesting is finished
+    wait for new master stderr message STATS_SEND_STATISTICS_REQUEST
+    wait for new master stderr message XFROUT_RECEIVED_GETSTATS_COMMAND
+
     When I query statistics zones of bind10 module Xfrout with cmdctl port 47804
     last bindctl output should not contain "error"
-    Then wait for new master stderr message XFROUT_RECEIVED_GETSTATS_COMMAND
     The counter notifyoutv4 for the zone _SERVER_ should be 0
     The counter notifyoutv4 for the zone example.org. should be 0
     The counter notifyoutv6 for the zone _SERVER_ should be 5
@@ -123,9 +127,13 @@ Feature: Xfrin incoming notify handling
     #
     # check for statistics change
     #
+
+    # wait until the last stats requesting is finished
+    wait for new master stderr message STATS_SEND_STATISTICS_REQUEST
+    wait for new master stderr message XFROUT_RECEIVED_GETSTATS_COMMAND
+
     When I query statistics zones of bind10 module Xfrout with cmdctl port 47804
     last bindctl output should not contain "error"
-    Then wait for new master stderr message XFROUT_RECEIVED_GETSTATS_COMMAND
     The counter notifyoutv4 for the zone _SERVER_ should be 0
     The counter notifyoutv4 for the zone example.org. should be 0
     The counter notifyoutv6 for the zone _SERVER_ should be 5
@@ -133,8 +141,6 @@ Feature: Xfrin incoming notify handling
     # The counts of rejection would be between 1 and 2. They are not
     # fixed. It would depend on timing or the platform.
     The counter xfrrej for the zone _SERVER_ should be greater than 0
-    The counter xfrrej for the zone _SERVER_ should be less than 3
     The counter xfrrej for the zone example.org. should be greater than 0
-    The counter xfrrej for the zone example.org. should be less than 3
     The counter xfrreqdone for the zone _SERVER_ should be 0
     The counter xfrreqdone for the zone example.org. should be 0