diff options
| -rw-r--r-- | qpid/cpp/include/qpid/types/Variant.h | 3 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/types/Variant.cpp | 1 | ||||
| -rwxr-xr-x | qpid/cpp/src/tests/swig_python_tests | 10 | ||||
| -rw-r--r-- | qpid/tests/src/py/qpid_tests/broker_1_0/selector.py | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/qpid/cpp/include/qpid/types/Variant.h b/qpid/cpp/include/qpid/types/Variant.h index e6bfd6bc0a..faba5fe9a4 100644 --- a/qpid/cpp/include/qpid/types/Variant.h +++ b/qpid/cpp/include/qpid/types/Variant.h @@ -38,7 +38,8 @@ namespace types { */ struct QPID_TYPES_CLASS_EXTERN InvalidConversion : public Exception { - InvalidConversion(const std::string& msg); + QPID_TYPES_EXTERN InvalidConversion(const std::string& msg); + QPID_TYPES_EXTERN ~InvalidConversion() throw(); }; enum VariantType { diff --git a/qpid/cpp/src/qpid/types/Variant.cpp b/qpid/cpp/src/qpid/types/Variant.cpp index 7a5f36851a..292bb5ef09 100644 --- a/qpid/cpp/src/qpid/types/Variant.cpp +++ b/qpid/cpp/src/qpid/types/Variant.cpp @@ -36,6 +36,7 @@ const std::string PREFIX("invalid conversion: "); } InvalidConversion::InvalidConversion(const std::string& msg) : Exception(PREFIX + msg) {} +InvalidConversion::~InvalidConversion() throw() {} class VariantImpl { diff --git a/qpid/cpp/src/tests/swig_python_tests b/qpid/cpp/src/tests/swig_python_tests index 2c5ad3b3b2..2ad17ebc33 100755 --- a/qpid/cpp/src/tests/swig_python_tests +++ b/qpid/cpp/src/tests/swig_python_tests @@ -50,17 +50,13 @@ start_broker echo "Running swigged python tests using broker on port $QPID_PORT" export PYTHONPATH=$PYTHONPATH:$PYTHONPATH_SWIG -$QPID_PYTHON_TEST -m qpid.tests.messaging.message -m qpid_tests.broker_0_10.priority -m qpid_tests.broker_0_10.lvq -m qpid_tests.broker_0_10.new_api -b localhost:$QPID_PORT -I $srcdir/failing-amqp0-10-python-tests -RESULT=$? +$QPID_PYTHON_TEST -m qpid.tests.messaging.message -m qpid_tests.broker_0_10.priority -m qpid_tests.broker_0_10.lvq -m qpid_tests.broker_0_10.new_api -b localhost:$QPID_PORT -I $srcdir/failing-amqp0-10-python-tests || FAILED=1 if [[ -a $AMQPC_LIB ]] ; then export QPID_LOAD_MODULE=$AMQPC_LIB - $QPID_PYTHON_TEST --define="protocol_version=amqp1.0" -m qpid_tests.broker_1_0 -b localhost:$QPID_PORT -I $srcdir/failing-amqp1.0-python-tests - if test x$RESULT == x0; then - RESULT=$? - fi + $QPID_PYTHON_TEST --define="protocol_version=amqp1.0" -m qpid_tests.broker_1_0 -b localhost:$QPID_PORT -I $srcdir/failing-amqp1.0-python-tests || FAILED=1 fi stop_broker -if test x$RESULT != x0; then +if [[ $FAILED -eq 1 ]]; then fail "" fi diff --git a/qpid/tests/src/py/qpid_tests/broker_1_0/selector.py b/qpid/tests/src/py/qpid_tests/broker_1_0/selector.py index 2e956cecb6..696fbf01c3 100644 --- a/qpid/tests/src/py/qpid_tests/broker_1_0/selector.py +++ b/qpid/tests/src/py/qpid_tests/broker_1_0/selector.py @@ -52,7 +52,7 @@ class SelectorTests (Base): self.basic_selection_test("#") def test_special_fields(self): - msgs = [Message(content=i, id=i, correlation_id=i, priority=p) for p, i in enumerate(['a', 'b', 'c', 'd'], 1)] + msgs = [Message(content=i, id=i, correlation_id=i, priority=p+1) for p, i in enumerate(['a', 'b', 'c', 'd'])] snd = self.ssn.sender("#") rcv_1 = self.ssn.receiver("%s; {link:{selector:\"amqp.message_id = 'c'\"}}" % snd.target) |