diff options
| author | Mehdi Abaakouk <sileht@redhat.com> | 2015-02-07 03:35:05 +0100 |
|---|---|---|
| committer | Mehdi Abaakouk <mehdi.abaakouk@enovance.com> | 2015-02-11 16:25:04 +0000 |
| commit | b2f505ee577162e47683ca1ce7a28cacf767aeb5 (patch) | |
| tree | 263fd23adce807ca26562cf777d769ac6db02d66 | |
| parent | 62ce02cc8ac10bfec2f0de9c7cc577325d37758b (diff) | |
| download | oslo-messaging-b2f505ee577162e47683ca1ce7a28cacf767aeb5.tar.gz | |
amqp1: fix functional tests deps
This change increases the version of python-qpid-proton to works
on fedora21.
It also installs qpid-tools to ensure authentification works before
starting the tests.
Change-Id: Ic8eb3b80ef4af6ca8cecbb6fba71cb69c0af3101
| -rw-r--r-- | amqp1-requirements.txt | 2 | ||||
| -rwxr-xr-x | oslo_messaging/tests/functional/gate/post_test_hook.sh | 9 | ||||
| -rw-r--r-- | tox.ini | 4 |
3 files changed, 12 insertions, 3 deletions
diff --git a/amqp1-requirements.txt b/amqp1-requirements.txt index bf8a37e..6303dc7 100644 --- a/amqp1-requirements.txt +++ b/amqp1-requirements.txt @@ -5,5 +5,5 @@ # amqp1 driver tox tests this way: # tox -e amqp1 pyngus>=1.0.0,<2.0.0 # Apache-2.0 -python-qpid-proton>=0.7,<0.8 # Apache-2.0 +python-qpid-proton>=0.7,<0.9 # Apache-2.0 diff --git a/oslo_messaging/tests/functional/gate/post_test_hook.sh b/oslo_messaging/tests/functional/gate/post_test_hook.sh index df6c51a..2388a04 100755 --- a/oslo_messaging/tests/functional/gate/post_test_hook.sh +++ b/oslo_messaging/tests/functional/gate/post_test_hook.sh @@ -16,5 +16,14 @@ RPC_BACKEND=$1 +case $RPC_BACKEND in + amqp1|qpid) + # Ensure authentification works before continuing, otherwise tests + # will retries forever + sudo yum install -y qpid-tools + qpid-config --sasl-mechanism=PLAIN -a stackqpid/secretqpid@127.0.0.1 + ;; +esac + cd $BASE/new/oslo.messaging sudo -H -u stack tox -e py27-func-$RPC_BACKEND @@ -43,8 +43,8 @@ commands = python setup.py testr --slowest --testr-args='oslo_messaging.tests.fu setenv = TRANSPORT_URL=amqp://stackqpid:secretqpid@127.0.0.1// deps = -r{toxinidir}/amqp1-requirements.txt {[testenv]deps} -# NOTE(sileht): until ubuntu get proto packages, we run amqp_driver tests here -# because this is the only target to run fedora 20 in gate +# NOTE(sileht): This gate job run in fedora21 because proton libs are not +# available on ubuntu yet, commands = python setup.py testr --slowest --testr-args='oslo_messaging.tests.(functional|test_amqp_driver)' [testenv:py27-func-zeromq] |