diff options
| author | Alan Conway <aconway@apache.org> | 2014-04-11 13:18:23 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2014-04-11 13:18:23 +0000 |
| commit | c7f2cd12b45f051cd1d421d8c440f12d007a50b4 (patch) | |
| tree | afcba64fa47fdb2693cc9788218956fb2cb90347 | |
| parent | 113040bb168f4bcd9aaeeeecae38f0510093aca4 (diff) | |
| download | qpid-python-c7f2cd12b45f051cd1d421d8c440f12d007a50b4.tar.gz | |
QPID-5681: Fix core dump in interlink_tests.
Use native python client for older (<=0.6) versions of proton.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586646 13f79535-47bb-0310-9956-ffa450edef68
| -rwxr-xr-x | qpid/cpp/src/tests/interlink_tests.py | 7 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/test_env.sh.in | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/qpid/cpp/src/tests/interlink_tests.py b/qpid/cpp/src/tests/interlink_tests.py index bb82b1c956..20ce6167a8 100755 --- a/qpid/cpp/src/tests/interlink_tests.py +++ b/qpid/cpp/src/tests/interlink_tests.py @@ -72,7 +72,12 @@ class AmqpBrokerTest(BrokerTest): return self.popen(cmd, stdout=PIPE) def ready_receiver(self, config): - s = self.broker.connect().session() + # NOTE: some tests core dump when run with SWIG binding over proton + # version<=0.6. This is fixed on proton 0.7. + def use_native(): + pv=os.environ.get("QPID_PROTON_VERSION") + return pv and [int(n) for n in pv.split(".")] <= [0,6] + s = self.broker.connect(native=use_native()).session() r = s.receiver("readyq; {create:always}") cmd = ["qpid-receive", "--broker", config.url, diff --git a/qpid/cpp/src/tests/test_env.sh.in b/qpid/cpp/src/tests/test_env.sh.in index 678f7aa223..b92416b415 100644 --- a/qpid/cpp/src/tests/test_env.sh.in +++ b/qpid/cpp/src/tests/test_env.sh.in @@ -94,3 +94,6 @@ test -z "$BOOST_TEST_CATCH_SYSTEM_ERRORS" && export BOOST_TEST_CATCH_SYSTEM_ERRO # Source this for useful common testing functions export QPID_TEST_COMMON=$srcdir/test_env_common.sh + +# Proton configuration +export QPID_PROTON_VERSION=@Proton_VERSION@ |