diff --git a/setup-test-env-zmq-direct-static.sh b/setup-test-env-zmq-direct-dynamic.sh similarity index 95% rename from setup-test-env-zmq-direct-static.sh rename to setup-test-env-zmq-direct-dynamic.sh index 32dd229b0..ba7ccd17b 100755 --- a/setup-test-env-zmq-direct-static.sh +++ b/setup-test-env-zmq-direct-dynamic.sh @@ -11,7 +11,7 @@ export ZMQ_REDIS_PORT=65123 export ZMQ_IPC_DIR=${DATADIR} export ZMQ_USE_PUB_SUB=false export ZMQ_USE_ROUTER_PROXY=false -export ZMQ_USE_DYNAMIC_CONNECTIONS=false +export ZMQ_USE_DYNAMIC_CONNECTIONS=true export ZMQ_USE_ACKS=false export TRANSPORT_URL="zmq+${ZMQ_MATCHMAKER}://127.0.0.1:${ZMQ_REDIS_PORT}" diff --git a/setup-test-env-zmq.sh b/setup-test-env-zmq.sh index 8fd7e11cf..eae47339d 100755 --- a/setup-test-env-zmq.sh +++ b/setup-test-env-zmq.sh @@ -12,7 +12,7 @@ export ZMQ_IPC_DIR=${DATADIR} export ZMQ_USE_PUB_SUB=false export ZMQ_USE_ROUTER_PROXY=false export ZMQ_USE_ACKS=false -export ZMQ_USE_DYNAMIC_CONNECTIONS=true +export ZMQ_USE_DYNAMIC_CONNECTIONS=false export TRANSPORT_URL="zmq+${ZMQ_MATCHMAKER}://127.0.0.1:${ZMQ_REDIS_PORT}" cat > ${DATADIR}/zmq.conf < ${DATADIR}/zmq-proxy.log 2>&1 & - $* diff --git a/tox.ini b/tox.ini index 838865fb0..beab5fa6a 100644 --- a/tox.ini +++ b/tox.ini @@ -79,8 +79,8 @@ commands = {toxinidir}/setup-test-env-zmq.sh python setup.py testr --slowest --t [testenv:py35-func-zmq] commands = {toxinidir}/setup-test-env-zmq.sh python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}' -[testenv:py27-func-zmq-direct] -commands = {toxinidir}/setup-test-env-zmq-direct-static.sh python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}' +[testenv:py27-func-zmq-dyn] +commands = {toxinidir}/setup-test-env-zmq-direct-dynamic.sh python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}' [testenv:py27-func-zmq-proxy] commands = {toxinidir}/setup-test-env-zmq-proxy.sh python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}'