BIND 10 master, updated. 9bcad85c5805dd4997d59bf15646aa18ceaf3d20 Merge branch 'trac3301'
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Feb 11 06:16:18 UTC 2014
The branch, master has been updated
via 9bcad85c5805dd4997d59bf15646aa18ceaf3d20 (commit)
via 85f9295ccf26f69cd6e7e30a9022b57ea9e9efda (commit)
via 4d41258322f18a64225f7f9e86b1bb42f64f995f (commit)
from 670eae890769e6a570cb568f668e9161b9f8c252 (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 9bcad85c5805dd4997d59bf15646aa18ceaf3d20
Merge: 670eae8 85f9295
Author: Mukund Sivaraman <muks at isc.org>
Date: Tue Feb 11 11:31:47 2014 +0530
Merge branch 'trac3301'
-----------------------------------------------------------------------
Summary of changes:
.../lettuce/features/xfrin_notify_handling.feature | 62 +++++++++++---------
1 file changed, 34 insertions(+), 28 deletions(-)
-----------------------------------------------------------------------
diff --git a/tests/lettuce/features/xfrin_notify_handling.feature b/tests/lettuce/features/xfrin_notify_handling.feature
index bba4f83..99bfbb4 100644
--- a/tests/lettuce/features/xfrin_notify_handling.feature
+++ b/tests/lettuce/features/xfrin_notify_handling.feature
@@ -52,14 +52,14 @@ Feature: Xfrin incoming notify handling
When I send bind10 with cmdctl port 56174 the command Xfrout notify example.org IN
Then wait for new master stderr message XFROUT_NOTIFY_COMMAND
Then wait for new bind10 stderr message AUTH_RECEIVED_NOTIFY
- # From this point we can't reliably 'wait for new' because the ordering
- # of logs from different processes is unpredictable. But these
- # should be okay in this case.
- Then wait for bind10 stderr message ZONEMGR_RECEIVE_NOTIFY
- Then wait for bind10 stderr message XFRIN_XFR_TRANSFER_STARTED
- Then wait for bind10 stderr message XFRIN_TRANSFER_SUCCESS not XFRIN_XFR_PROCESS_FAILURE
- Then wait for bind10 stderr message ZONEMGR_RECEIVE_XFRIN_SUCCESS
- Then wait for master stderr message NOTIFY_OUT_REPLY_RECEIVED
+ Then wait for new bind10 stderr message ZONEMGR_RECEIVE_NOTIFY
+ # Note: The following waits should be for *new* log messages, or
+ # they will match older log messages that were generated by AXFR
+ # during startup.
+ Then wait for new bind10 stderr message XFRIN_XFR_TRANSFER_STARTED
+ Then wait for new bind10 stderr message XFRIN_TRANSFER_SUCCESS not XFRIN_XFR_PROCESS_FAILURE
+ Then wait for new bind10 stderr message ZONEMGR_RECEIVE_XFRIN_SUCCESS
+ Then wait for new master stderr message NOTIFY_OUT_REPLY_RECEIVED
A query for www.example.org to [::1]:56176 should have rcode NOERROR
# Make sure handling statistics command handling checked below is
@@ -164,14 +164,14 @@ Feature: Xfrin incoming notify handling
When I send bind10 with cmdctl port 56174 the command Xfrout notify example.org IN
Then wait for new master stderr message XFROUT_NOTIFY_COMMAND
Then wait for new bind10 stderr message AUTH_RECEIVED_NOTIFY
- # From this point we can't reliably 'wait for new' because the ordering
- # of logs from different processes is unpredictable. But these
- # should be okay in this case.
- Then wait for bind10 stderr message ZONEMGR_RECEIVE_NOTIFY
- Then wait for bind10 stderr message XFRIN_XFR_TRANSFER_STARTED
- Then wait for bind10 stderr message XFRIN_TRANSFER_SUCCESS not XFRIN_XFR_PROCESS_FAILURE
- Then wait for bind10 stderr message ZONEMGR_RECEIVE_XFRIN_SUCCESS
- Then wait for master stderr message NOTIFY_OUT_REPLY_RECEIVED
+ Then wait for new bind10 stderr message ZONEMGR_RECEIVE_NOTIFY
+ # Note: The following waits should be for *new* log messages, or
+ # they will match older log messages that were generated by AXFR
+ # during startup.
+ Then wait for new bind10 stderr message XFRIN_XFR_TRANSFER_STARTED
+ Then wait for new bind10 stderr message XFRIN_TRANSFER_SUCCESS not XFRIN_XFR_PROCESS_FAILURE
+ Then wait for new bind10 stderr message ZONEMGR_RECEIVE_XFRIN_SUCCESS
+ Then wait for new master stderr message NOTIFY_OUT_REPLY_RECEIVED
A query for www.example.org to 127.0.0.1:56176 should have rcode NOERROR
# Make sure handling statistics command handling checked below is
@@ -283,16 +283,19 @@ Feature: Xfrin incoming notify handling
config commit
"""
last bindctl output should not contain Error
+ Then wait for new master stderr message XFROUT_NEW_CONFIG_DONE
When I send bind10 with cmdctl port 56174 the command Xfrout notify example.org IN
Then wait for new master stderr message XFROUT_NOTIFY_COMMAND
Then wait for new bind10 stderr message AUTH_RECEIVED_NOTIFY
- # can't use 'wait for new' below.
- Then wait for bind10 stderr message ZONEMGR_RECEIVE_NOTIFY
- Then wait for bind10 stderr message XFRIN_XFR_TRANSFER_STARTED
- Then wait for bind10 stderr message XFRIN_XFR_TRANSFER_PROTOCOL_VIOLATION not XFRIN_TRANSFER_SUCCESS
- Then wait for bind10 stderr message ZONEMGR_RECEIVE_XFRIN_FAILED not ZONEMGR_RECEIVE_XFRIN_SUCCESS
- Then wait for master stderr message NOTIFY_OUT_REPLY_RECEIVED
+ Then wait for new bind10 stderr message ZONEMGR_RECEIVE_NOTIFY
+ # Note: The following waits should be for *new* log messages, or
+ # they will match older log messages that were generated by AXFR
+ # during startup.
+ Then wait for new bind10 stderr message XFRIN_XFR_TRANSFER_STARTED
+ Then wait for new bind10 stderr message XFRIN_XFR_TRANSFER_PROTOCOL_VIOLATION not XFRIN_TRANSFER_SUCCESS
+ Then wait for new bind10 stderr message ZONEMGR_RECEIVE_XFRIN_FAILED not ZONEMGR_RECEIVE_XFRIN_SUCCESS
+ Then wait for new master stderr message NOTIFY_OUT_REPLY_RECEIVED
A query for www.example.org to [::1]:56176 should have rcode NXDOMAIN
@@ -399,16 +402,19 @@ Feature: Xfrin incoming notify handling
config commit
"""
last bindctl output should not contain Error
+ Then wait for new master stderr message XFROUT_NEW_CONFIG_DONE
When I send bind10 with cmdctl port 56174 the command Xfrout notify example.org IN
Then wait for new master stderr message XFROUT_NOTIFY_COMMAND
Then wait for new bind10 stderr message AUTH_RECEIVED_NOTIFY
- # can't use 'wait for new' below.
- Then wait for bind10 stderr message ZONEMGR_RECEIVE_NOTIFY
- Then wait for bind10 stderr message XFRIN_XFR_TRANSFER_STARTED
- Then wait for bind10 stderr message XFRIN_XFR_TRANSFER_PROTOCOL_VIOLATION not XFRIN_TRANSFER_SUCCESS
- Then wait for bind10 stderr message ZONEMGR_RECEIVE_XFRIN_FAILED not ZONEMGR_RECEIVE_XFRIN_SUCCESS
- Then wait for master stderr message NOTIFY_OUT_REPLY_RECEIVED
+ Then wait for new bind10 stderr message ZONEMGR_RECEIVE_NOTIFY
+ # Note: The following waits should be for *new* log messages, or
+ # they will match older log messages that were generated by AXFR
+ # during startup.
+ Then wait for new bind10 stderr message XFRIN_XFR_TRANSFER_STARTED
+ Then wait for new bind10 stderr message XFRIN_XFR_TRANSFER_PROTOCOL_VIOLATION not XFRIN_TRANSFER_SUCCESS
+ Then wait for new bind10 stderr message ZONEMGR_RECEIVE_XFRIN_FAILED not ZONEMGR_RECEIVE_XFRIN_SUCCESS
+ Then wait for new master stderr message NOTIFY_OUT_REPLY_RECEIVED
A query for www.example.org to 127.0.0.1:56176 should have rcode NXDOMAIN
More information about the bind10-changes
mailing list