Author: tross
Date: Tue Sep 3 19:47:38 2013
New Revision: 1519811
URL: http://svn.apache.org/r1519811
Log:
NO-JIRA - Updated for compatibility with changes in Proton 0.5
- Proton Python interface was changed to make timeouts expressed as seconds
(floating point).
- Two references to the moved python modules were fixed.
Modified:
qpid/trunk/qpid/extras/dispatch/src/router_node.c
qpid/trunk/qpid/extras/dispatch/tests/router_engine_test.py
qpid/trunk/qpid/extras/dispatch/tests/system_tests_one_router.py
Modified: qpid/trunk/qpid/extras/dispatch/src/router_node.c
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/src/router_node.c?rev=1519811&r1=1519810&r2=1519811&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/src/router_node.c (original)
+++ qpid/trunk/qpid/extras/dispatch/src/router_node.c Tue Sep 3 19:47:38 2013
@@ -1038,7 +1038,7 @@ static void dx_router_python_setup(dx_ro
PyObject* pClass;
PyObject* pArgs;
- pName = PyString_FromString("router");
+ pName = PyString_FromString("qpid.dispatch.router");
pModule = PyImport_Import(pName);
Py_DECREF(pName);
if (!pModule) {
Modified: qpid/trunk/qpid/extras/dispatch/tests/router_engine_test.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/tests/router_engine_test.py?rev=1519811&r1=1519810&r2=1519811&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/tests/router_engine_test.py (original)
+++ qpid/trunk/qpid/extras/dispatch/tests/router_engine_test.py Tue Sep 3
19:47:38 2013
@@ -18,8 +18,8 @@
#
import unittest
-from router.router_engine import NeighborEngine, PathEngine, Configuration
-from router.data import LinkState, MessageHELLO
+from qpid.dispatch.router.router_engine import NeighborEngine, PathEngine,
Configuration
+from qpid.dispatch.router.data import LinkState, MessageHELLO
class Adapter(object):
def __init__(self, domain):
Modified: qpid/trunk/qpid/extras/dispatch/tests/system_tests_one_router.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/tests/system_tests_one_router.py?rev=1519811&r1=1519810&r2=1519811&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/tests/system_tests_one_router.py (original)
+++ qpid/trunk/qpid/extras/dispatch/tests/system_tests_one_router.py Tue Sep 3
19:47:38 2013
@@ -38,7 +38,7 @@ class RouterTest(unittest.TestCase):
self.router.wait()
def flush(self, messenger):
- while messenger.work(100):
+ while messenger.work(0.1):
pass
def subscribe(self, messenger, address):
@@ -48,7 +48,7 @@ class RouterTest(unittest.TestCase):
def test_0_discard(self):
addr = "amqp://0.0.0.0:20000/discard/1"
M1 = Messenger()
- M1.timeout = 1000
+ M1.timeout = 1.0
M1.start()
tm = Message()
tm.address = addr
@@ -58,14 +58,13 @@ class RouterTest(unittest.TestCase):
M1.send()
M1.stop()
-
def test_1_pre_settled(self):
addr = "amqp://0.0.0.0:20000/pre_settled/1"
M1 = Messenger()
M2 = Messenger()
- M1.timeout = 1000
- M2.timeout = 1000
+ M1.timeout = 1.0
+ M2.timeout = 1.0
M1.start()
M2.start()
@@ -96,10 +95,10 @@ class RouterTest(unittest.TestCase):
M3 = Messenger()
M4 = Messenger()
- M1.timeout = 1000
- M2.timeout = 1000
- M3.timeout = 1000
- M4.timeout = 1000
+ M1.timeout = 1.0
+ M2.timeout = 1.0
+ M3.timeout = 1.0
+ M4.timeout = 1.0
M1.start()
M2.start()
@@ -142,8 +141,8 @@ class RouterTest(unittest.TestCase):
M1 = Messenger()
M2 = Messenger()
- M1.timeout = 1000
- M2.timeout = 1000
+ M1.timeout = 1.0
+ M2.timeout = 1.0
M1.outgoing_window = 5
M2.incoming_window = 5
@@ -205,8 +204,8 @@ class RouterTest(unittest.TestCase):
M1 = Messenger()
M2 = Messenger()
- M1.timeout = 1000
- M2.timeout = 1000
+ M1.timeout = 1.0
+ M2.timeout = 1.0
M1.outgoing_window = 5
M2.incoming_window = 5
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
