BIND 10 trac1924, updated. 89c595272222aa858ddbb6559dc3ec5aff63f2a5 [1924] Remove BUILT_SOURCES from CLEANFILES
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Feb 8 11:17:22 UTC 2013
The branch, trac1924 has been updated
via 89c595272222aa858ddbb6559dc3ec5aff63f2a5 (commit)
via 266bf8571b08bed62aa5c65f525826d1fb625bbc (commit)
via 3a07d07e04c693056cc4c50a1ac3b79d5696f05b (commit)
via 6c5b161b7b67dab51d46984ce94bddd7a3c3c30b (commit)
from c45a2112f2ecec8f96e7810f4f5dfd7d46043e4a (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 89c595272222aa858ddbb6559dc3ec5aff63f2a5
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Fri Feb 8 11:21:18 2013 +0100
[1924] Remove BUILT_SOURCES from CLEANFILES
commit 266bf8571b08bed62aa5c65f525826d1fb625bbc
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Fri Feb 8 11:18:06 2013 +0100
[1924] (minor) Clarify a doc comment
commit 3a07d07e04c693056cc4c50a1ac3b79d5696f05b
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Fri Feb 8 11:16:15 2013 +0100
[1924] Less confusing parameter names for sendmsg
Changed to header and payload, which removes the confusion of the first
part message being called env and the other called msg in one send and
the first being msg (and the second omitted) in the second case.
commit 6c5b161b7b67dab51d46984ce94bddd7a3c3c30b
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Fri Feb 8 11:07:09 2013 +0100
[1924] Reuse common test code
-----------------------------------------------------------------------
Summary of changes:
src/bin/msgq/tests/msgq_test.py | 102 +++++++++++++++------------------
src/lib/cc/session.cc | 10 ++--
src/lib/cc/session.h | 6 +-
src/lib/cc/tests/session_unittests.cc | 8 +--
src/lib/python/isc/cc/session.py | 6 +-
src/lib/python/isc/util/Makefile.am | 1 -
src/lib/util/Makefile.am | 2 +-
7 files changed, 61 insertions(+), 74 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/msgq/tests/msgq_test.py b/src/bin/msgq/tests/msgq_test.py
index cf2e7dd..4f8d18a 100644
--- a/src/bin/msgq/tests/msgq_test.py
+++ b/src/bin/msgq/tests/msgq_test.py
@@ -175,9 +175,9 @@ class MsgQTest(unittest.TestCase):
is missing to how we hendle the value in reply header). If
we included everything, the test would have too many scenarios.
"""
- sent_messages = []
+ self.__sent_messages = []
def fake_send_prepared_msg(socket, msg):
- sent_messages.append((socket, msg))
+ self.__sent_messages.append((socket, msg))
return True
self.__msgq.send_prepared_msg = fake_send_prepared_msg
# These would be real sockets in the MsgQ, but we pass them as
@@ -197,69 +197,71 @@ class MsgQTest(unittest.TestCase):
data = {
"data": "Just some data"
}
+
+ # Some common checking patterns
+ def check_error():
+ self.assertEqual(1, len(self.__sent_messages))
+ self.assertEqual(1, self.__sent_messages[0][0])
+ self.assertEqual(({
+ 'group': 'group',
+ 'instance': '*',
+ 'reply': 42,
+ 'seq': 42,
+ 'from': 'msgq',
+ 'to': 'sender',
+ 'want_answer': True
+ }, {'result': [-1, "No such recipient"]}),
+ self.parse_msg(self.__sent_messages[0][1]))
+ self.__sent_messages = []
+
+ def check_no_message():
+ self.assertEqual([], self.__sent_messages)
+
+ def check_delivered(rcpt_socket=recipient):
+ self.assertEqual(1, len(self.__sent_messages))
+ self.assertEqual(rcpt_socket, self.__sent_messages[0][0])
+ self.assertEqual((routing, data),
+ self.parse_msg(self.__sent_messages[0][1]))
+ self.__sent_messages = []
+
# Send the message. No recipient, but errors are not requested,
# so none is generated.
self.__msgq.process_command_send(sender, routing, data)
- self.assertEqual([], sent_messages)
+ check_no_message()
+
# It should act the same if we explicitly say we do not want replies.
routing["want_answer"] = False
self.__msgq.process_command_send(sender, routing, data)
- self.assertEqual([], sent_messages)
+ check_no_message()
+
# Ask for errors if it can't be delivered.
routing["want_answer"] = True
self.__msgq.process_command_send(sender, routing, data)
- self.assertEqual(1, len(sent_messages))
- self.assertEqual(1, sent_messages[0][0])
- self.assertEqual(({
- 'group': 'group',
- 'instance': '*',
- 'reply': 42,
- 'seq': 42,
- 'from': 'msgq',
- 'to': 'sender',
- 'want_answer': True
- }, {'result': [-1, "No such recipient"]}),
- self.parse_msg(sent_messages[0][1]))
- # the reply header too.
- sent_messages = []
+ check_error()
+
# If the message is a reply itself, we never generate the errors
routing["reply"] = 3
self.__msgq.process_command_send(sender, routing, data)
- self.assertEqual([], sent_messages)
+ check_no_message()
+
# If there are recipients (but no "reply" header), the error should not
# be sent and the message should get delivered.
del routing["reply"]
self.__msgq.subs.find = lambda group, instance: [recipient]
self.__msgq.process_command_send(sender, routing, data)
- self.assertEqual(1, len(sent_messages))
- self.assertEqual(2, sent_messages[0][0]) # The recipient
- self.assertEqual((routing, data), self.parse_msg(sent_messages[0][1]))
- sent_messages = []
+ check_delivered()
+
# When we send a direct message and the recipient is not there, we get
# the error too
routing["to"] = "lname"
self.__msgq.process_command_send(sender, routing, data)
- self.assertEqual(1, len(sent_messages))
- self.assertEqual(1, sent_messages[0][0])
- self.assertEqual(({
- 'group': 'group',
- 'instance': '*',
- 'reply': 42,
- 'seq': 42,
- 'from': 'msgq',
- 'to': 'sender',
- 'want_answer': True
- }, {'result': [-1, "No such recipient"]}),
- self.parse_msg(sent_messages[0][1]))
- sent_messages = []
+ check_error()
+
# But when the recipient is there, it is delivered and no error is
# generated.
self.__msgq.lnames["lname"] = recipient
self.__msgq.process_command_send(sender, routing, data)
- self.assertEqual(1, len(sent_messages))
- self.assertEqual(2, sent_messages[0][0]) # The recipient
- self.assertEqual((routing, data), self.parse_msg(sent_messages[0][1]))
- sent_messages = []
+ check_delivered()
# If an attempt to send fails, consider it no recipient.
def fail_send_prepared_msg(socket, msg):
@@ -272,19 +274,8 @@ class MsgQTest(unittest.TestCase):
self.__msgq.send_prepared_msg = fail_send_prepared_msg
self.__msgq.process_command_send(sender, routing, data)
- self.assertEqual(1, len(sent_messages))
- self.assertEqual(1, sent_messages[0][0])
- self.assertEqual(({
- 'group': 'group',
- 'instance': '*',
- 'reply': 42,
- 'seq': 42,
- 'from': 'msgq',
- 'to': 'sender',
- 'want_answer': True
- }, {'result': [-1, "No such recipient"]}),
- self.parse_msg(sent_messages[0][1]))
- sent_messages = []
+ check_error()
+
# But if there are more recipients and only one fails, it should
# be delivered to the other and not considered an error
self.__msgq.send_prepared_msg = fail_send_prepared_msg
@@ -292,10 +283,7 @@ class MsgQTest(unittest.TestCase):
self.__msgq.subs.find = lambda group, instance: [recipient,
another_recipiet]
self.__msgq.process_command_send(sender, routing, data)
- self.assertEqual(1, len(sent_messages))
- self.assertEqual(3, sent_messages[0][0]) # The recipient
- self.assertEqual((routing, data), self.parse_msg(sent_messages[0][1]))
- sent_messages = []
+ check_delivered(rcpt_socket=another_recipiet)
class DummySocket:
"""
diff --git a/src/lib/cc/session.cc b/src/lib/cc/session.cc
index bd743c7..b300aad 100644
--- a/src/lib/cc/session.cc
+++ b/src/lib/cc/session.cc
@@ -343,8 +343,8 @@ Session::establish(const char* socket_file) {
// prefix.
//
void
-Session::sendmsg(ConstElementPtr msg) {
- std::string header_wire = msg->toWire();
+Session::sendmsg(ConstElementPtr header) {
+ std::string header_wire = header->toWire();
unsigned int length = 2 + header_wire.length();
unsigned int length_net = htonl(length);
unsigned short header_length = header_wire.length();
@@ -356,9 +356,9 @@ Session::sendmsg(ConstElementPtr msg) {
}
void
-Session::sendmsg(ConstElementPtr env, ConstElementPtr msg) {
- std::string header_wire = env->toWire();
- std::string body_wire = msg->toWire();
+Session::sendmsg(ConstElementPtr header, ConstElementPtr payload) {
+ std::string header_wire = header->toWire();
+ std::string body_wire = payload->toWire();
unsigned int length = 2 + header_wire.length() + body_wire.length();
unsigned int length_net = htonl(length);
unsigned short header_length = header_wire.length();
diff --git a/src/lib/cc/session.h b/src/lib/cc/session.h
index 312f784..b5c29f9 100644
--- a/src/lib/cc/session.h
+++ b/src/lib/cc/session.h
@@ -172,9 +172,9 @@ namespace isc {
// replace them. It is not expected to be specialized by a derived
// class. Actually, it is not expected to inherit from this class
// to begin with.
- virtual void sendmsg(isc::data::ConstElementPtr msg);
- virtual void sendmsg(isc::data::ConstElementPtr env,
- isc::data::ConstElementPtr msg);
+ virtual void sendmsg(isc::data::ConstElementPtr header);
+ virtual void sendmsg(isc::data::ConstElementPtr header,
+ isc::data::ConstElementPtr payload);
bool recvmsg(isc::data::ConstElementPtr& msg,
bool nonblock = true,
diff --git a/src/lib/cc/tests/session_unittests.cc b/src/lib/cc/tests/session_unittests.cc
index 1f66157..fc6e538 100644
--- a/src/lib/cc/tests/session_unittests.cc
+++ b/src/lib/cc/tests/session_unittests.cc
@@ -149,11 +149,11 @@ public:
private:
// Override the sendmsg. They are not sent over the real connection, but
// stored locally and can be extracted by getSentMessage()
- virtual void sendmsg(ConstElementPtr msg) {
- sendmsg(msg, ConstElementPtr(new isc::data::NullElement));
+ virtual void sendmsg(ConstElementPtr header) {
+ sendmsg(header, ConstElementPtr(new isc::data::NullElement));
}
- virtual void sendmsg(ConstElementPtr env, ConstElementPtr msg) {
- sent_messages_.push_back(SentMessage(env, msg));
+ virtual void sendmsg(ConstElementPtr header, ConstElementPtr payload) {
+ sent_messages_.push_back(SentMessage(header, payload));
}
// The sendmsg stores data here.
diff --git a/src/lib/python/isc/cc/session.py b/src/lib/python/isc/cc/session.py
index 976bfc5..c13979a 100644
--- a/src/lib/python/isc/cc/session.py
+++ b/src/lib/python/isc/cc/session.py
@@ -269,9 +269,9 @@ class Session:
- instance Instance in the group.
- to Direct recipient (overrides the above, should contain the
lname of the recipient).
- - want_answer If an answer is requested. If there's no recipient,
- the message queue would send an error message instead of the
- answer.
+ - want_answer If an answer is requested. If there's no recipient
+ and this is true, the message queue would send an error message
+ instead of the answer.
Return:
A sequence number that can be used to wait for an answer
diff --git a/src/lib/python/isc/util/Makefile.am b/src/lib/python/isc/util/Makefile.am
index d5d04bd..e8f737a 100644
--- a/src/lib/python/isc/util/Makefile.am
+++ b/src/lib/python/isc/util/Makefile.am
@@ -3,7 +3,6 @@ SUBDIRS = . cio tests
python_PYTHON = __init__.py process.py socketserver_mixin.py file.py \
common_defs.py
BUILT_SOURCES = common_defs.py
-CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = pythonize_constants.py
common_defs.py: $(top_srcdir)/src/lib/util/common_defs.cc pythonize_constants.py
diff --git a/src/lib/util/Makefile.am b/src/lib/util/Makefile.am
index 742302f..40c3afc 100644
--- a/src/lib/util/Makefile.am
+++ b/src/lib/util/Makefile.am
@@ -37,7 +37,7 @@ common_defs.h: const2hdr.py common_defs.cc
$(PYTHON) $(srcdir)/const2hdr.py $(srcdir)/common_defs.cc $@
libb10_util_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-CLEANFILES = *.gcno *.gcda common_defs.h
+CLEANFILES = *.gcno *.gcda
libb10_util_includedir = $(includedir)/$(PACKAGE_NAME)/util
libb10_util_include_HEADERS = buffer.h
More information about the bind10-changes
mailing list