[svn] commit: r1871 - /trunk/src/lib/python/isc/cc/tests/session_test.py
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu May 20 12:30:17 UTC 2010
Author: jelte
Date: Thu May 20 12:30:17 2010
New Revision: 1871
Log:
fixed test
Modified:
trunk/src/lib/python/isc/cc/tests/session_test.py
Modified: trunk/src/lib/python/isc/cc/tests/session_test.py
==============================================================================
--- trunk/src/lib/python/isc/cc/tests/session_test.py (original)
+++ trunk/src/lib/python/isc/cc/tests/session_test.py Thu May 20 12:30:17 2010
@@ -98,6 +98,7 @@
self._sequence = 1
self._closed = False
self._queue = []
+ self._lock = threading.RLock()
try:
self._socket = MySocket(socket.AF_INET, socket.SOCK_STREAM)
@@ -178,17 +179,12 @@
# sending message {'to': 'someone', 'reply': 1}, {"hello": "a"}
#print("sending message {'to': 'someone', 'reply': 1}, {'hello': 'a'}")
- # simply get the message without asking for a specific sequence number reply
+ # get no message without asking for a specific sequence number reply
self.assertFalse(sess.has_queued_msgs())
sess._socket.addrecv(b'\x00\x00\x00(\x00\x19Skan\x02to(\x07someone\x05reply&\x011Skan\x05hello(\x01a')
env, msg = sess.recvmsg(False)
- self.assertEqual({'to': 'someone', 'reply': 1}, env)
- self.assertEqual({"hello": "a"}, msg)
- self.assertFalse(sess.has_queued_msgs())
-
- # simply get the message, asking for a specific sequence number reply
- self.assertFalse(sess.has_queued_msgs())
- sess._socket.addrecv(b'\x00\x00\x00(\x00\x19Skan\x02to(\x07someone\x05reply&\x011Skan\x05hello(\x01a')
+ self.assertEqual(None, env)
+ self.assertTrue(sess.has_queued_msgs())
env, msg = sess.recvmsg(False, 1)
self.assertEqual({'to': 'someone', 'reply': 1}, env)
self.assertEqual({"hello": "a"}, msg)
@@ -215,7 +211,7 @@
self.assertEqual(None, env)
self.assertEqual(None, msg)
self.assertTrue(sess.has_queued_msgs())
- env, msg = sess.recvmsg(False)
+ env, msg = sess.recvmsg(False, 1)
self.assertEqual({'to': 'someone', 'reply': 1}, env)
self.assertEqual({"hello": "a"}, msg)
self.assertFalse(sess.has_queued_msgs())
@@ -223,7 +219,7 @@
#print("sending message {'to': 'someone', 'reply': 1}, {'hello': 'a'}")
# ask for a differe sequence number reply (that doesn't exist)
- # send a new message, ask for any message (get the first)
+ # send a new message, ask for specific message (get the first)
# then ask for any message (get the second)
self.assertFalse(sess.has_queued_msgs())
sess._socket.addrecv(b'\x00\x00\x00(\x00\x19Skan\x02to(\x07someone\x05reply&\x011Skan\x05hello(\x01a')
@@ -232,8 +228,8 @@
self.assertEqual(None, msg)
self.assertTrue(sess.has_queued_msgs())
sess._socket.addrecv(b'\x00\x00\x00\x1f\x00\x10Skan\x02to(\x07someoneSkan\x05hello(\x01b')
- env, msg = sess.recvmsg(False)
- self.assertEqual({'to': 'someone', 'reply': 1}, env)
+ env, msg = sess.recvmsg(False, 1)
+ self.assertEqual({'to': 'someone', 'reply': 1 }, env)
self.assertEqual({"hello": "a"}, msg)
self.assertFalse(sess.has_queued_msgs())
env, msg = sess.recvmsg(False)
More information about the bind10-changes
mailing list