Author: kpvdr Date: 2011-03-21 13:50:21 -0400 (Mon, 21 Mar 2011) New Revision: 4447 Modified: store/trunk/cpp/lib/JournalImpl.h store/trunk/cpp/tests/python_tests/client_persistence.py store/trunk/cpp/tests/run_python_tests Log: Fix for python_tests.client_persistence.ExchangeQueueTests.test_topic_exchange, which was broken by recent changes to the Python API Modified: store/trunk/cpp/lib/JournalImpl.h =================================================================== --- store/trunk/cpp/lib/JournalImpl.h 2011-03-04 18:57:42 UTC (rev 4446) +++ store/trunk/cpp/lib/JournalImpl.h 2011-03-21 17:50:21 UTC (rev 4447) @@ -76,8 +76,8 @@ typedef boost::function<void (JournalImpl&)> DeleteCallback; private: - static qpid::sys::Mutex _static_lock; - static u_int32_t cnt; +// static qpid::sys::Mutex _static_lock; +// static u_int32_t cnt; qpid::sys::Timer& timer; bool getEventsTimerSetFlag; Modified: store/trunk/cpp/tests/python_tests/client_persistence.py =================================================================== --- store/trunk/cpp/tests/python_tests/client_persistence.py 2011-03-04 18:57:42 UTC (rev 4446) +++ store/trunk/cpp/tests/python_tests/client_persistence.py 2011-03-21 17:50:21 UTC (rev 4447) @@ -49,12 +49,12 @@ ssn = broker.connect().session() snd1 = ssn.sender("abc/key1; {create:always, node:{type:topic, durable:True}}") snd2 = ssn.sender("abc/key2; {create:always, node:{type:topic, durable:True}}") - ssn.receiver("a; {create:always, link:{durable:True, x-bindings:[{exchange:abc, key:key1}]}}") - ssn.receiver("b; {create:always, link:{durable:True, x-bindings:[{exchange:abc, key:key1}]}}") - ssn.receiver("c; {create:always, link:{durable:True, x-bindings:[{exchange:abc, key:key1}, " - "{exchange:abc, key: key2}]}}") - ssn.receiver("d; {create:always, link:{durable:True, x-bindings:[{exchange:abc, key:key2}]}}") - ssn.receiver("e; {create:always, link:{durable:True, x-bindings:[{exchange:abc, key:key2}]}}") + ssn.receiver("a; {create:always, link:{x-bindings:[{exchange:abc, key:key1}]}, node:{durable:True}}") + ssn.receiver("b; {create:always, link:{x-bindings:[{exchange:abc, key:key1}]}, node:{durable:True}}") + ssn.receiver("c; {create:always, link:{x-bindings:[{exchange:abc, key:key1}, " + "{exchange:abc, key: key2}]}, node:{durable:True}}") + ssn.receiver("d; {create:always, link:{x-bindings:[{exchange:abc, key:key2}]}, node:{durable:True}}") + ssn.receiver("e; {create:always, link:{x-bindings:[{exchange:abc, key:key2}]}, node:{durable:True}}") msg1 = Message("Message1", durable=True, correlation_id="Msg0003") snd1.send(msg1) msg2 = Message("Message2", durable=True, correlation_id="Msg0004") Modified: store/trunk/cpp/tests/run_python_tests =================================================================== --- store/trunk/cpp/tests/run_python_tests 2011-03-04 18:57:42 UTC (rev 4446) +++ store/trunk/cpp/tests/run_python_tests 2011-03-21 17:50:21 UTC (rev 4447) @@ -58,7 +58,7 @@ # To debug a test, add the following options to the end of the following line: # -v DEBUG -c qpid.messaging.io.ops [*.testName] -${PYTHON_DIR}/qpid-python-test -m ${MODULENAME} -I ${FAILING_PYTHON_TESTS} ${PYTHON_TESTS} -DOUTDIR=$OUTDIR +${PYTHON_DIR}/qpid-python-test -m ${MODULENAME} -I ${FAILING_PYTHON_TESTS} ${PYTHON_TESTS} -DOUTDIR=$OUTDIR #-v DEBUG RETCODE=$? if test x${RETCODE} != x0; then