This patch contains 4 backports from master. Unfortunately, an update on
f21 is forcing to update the requirements for amqp1. Therefore, we need
these 2 commits, which depend on each other, to be backported as one.
To fix py27 unittests we should backport two more patches as well.
Commit 1:
Enable amqp's protocol unit tests everywhere
Now that python-qpid-proton has taken an approach similar to zmq's, it's
possible to install it in boxes where the C libraries are not present in
the system. This patch takes advantage of that to enable amqp protocol's
tests everywhere.
Note that the backport was modified to match the stable/kilo gate
configuration. This job, in Kilo, is supposed to run *just* on f21,
therefore, I've removed the changes to the tox.ini to avoid installing
the dependencies everywhere.
Master-Change-Id: Ibce4c791aafadf45fa876d6a4f5373fde94769ff
(cherry picked from commit f06b19628fbb11a32797f1095eba7c07b6343433)
Commit 2:
Fix qpid's functional gate
The loggin verbosity changed in 0.32 which our gate is pulling from the
updates repository. This patch updates the script to make it work again.
Closes-bug: #1468917
Master-Change-Id: I88a1bc794246beb156d4301bd503fa51a7cd2cce
(cherry picked from commit 079c04f0d06539f3507c772ccc68807a6d01a73a)
Commit 3:
Fix list_opts test to not check all deps
The list_opts entrypoint test failed unnecessarily when the
dependencies in the packages were inconsistent. This test doesn't
need to verify that the dependencies are consistent, only that the
entrypoint is available and provides the expected function.
(cherry picked from commit 3d483fda709d2d04db2222e0119eaa54de5f5867)
Commit 4:
Fix mock use for mock 1.1.0
Correct the way we check the calls by using the proper mock method. Add
a new test to expand coverage of the area being fixed.
(cherry picked from commit c7b31385ac3616060ef0f2188fb724191caad03c, but
the new tests was removed)
Co-Authored-By: Viktor Serhieiev <email address hidden>
Reviewed: https:/ /review. openstack. org/217770 /git.openstack. org/cgit/ openstack/ oslo.messaging/ commit/ ?id=d7ad1ee4373 987cc52b1a72c68 c444e78435fe2d
Committed: https:/
Submitter: Jenkins
Branch: stable/kilo
commit d7ad1ee4373987c c52b1a72c68c444 e78435fe2d
Author: Flavio Percoco <email address hidden>
Date: Fri Aug 14 16:35:30 2015 +0000
Fix gate jobs in stable/kilo (4 backports)
This patch contains 4 backports from master. Unfortunately, an update on
f21 is forcing to update the requirements for amqp1. Therefore, we need
these 2 commits, which depend on each other, to be backported as one.
To fix py27 unittests we should backport two more patches as well.
Commit 1:
Enable amqp's protocol unit tests everywhere
Now that python-qpid-proton has taken an approach similar to zmq's, it's
possible to install it in boxes where the C libraries are not present in
the system. This patch takes advantage of that to enable amqp protocol's
tests everywhere.
Note that the backport was modified to match the stable/kilo gate
configuration. This job, in Kilo, is supposed to run *just* on f21,
therefore, I've removed the changes to the tox.ini to avoid installing
the dependencies everywhere.
Master- Change- Id: Ibce4c791aafadf 45fa876d6a4f537 3fde94769ff 32797f1095eba7c 07b6343433)
(cherry picked from commit f06b19628fbb11a
Commit 2:
Fix qpid's functional gate
The loggin verbosity changed in 0.32 which our gate is pulling from the
updates repository. This patch updates the script to make it work again.
Closes-bug: #1468917 Change- Id: I88a1bc794246be b156d4301bd503f a51a7cd2cce 3507c772ccc6880 7a6d01a73a)
Master-
(cherry picked from commit 079c04f0d06539f
Commit 3:
Fix list_opts test to not check all deps
The list_opts entrypoint test failed unnecessarily when the
dependencies in the packages were inconsistent. This test doesn't
need to verify that the dependencies are consistent, only that the
entrypoint is available and provides the expected function.
(cherry picked from commit 3d483fda709d2d0 4db2222e0119eaa 54de5f5867)
Commit 4:
Fix mock use for mock 1.1.0
Correct the way we check the calls by using the proper mock method. Add
a new test to expand coverage of the area being fixed.
(cherry picked from commit c7b31385ac36160 60ef0f2188fb724 191caad03c, but
the new tests was removed)
Co-Authored-By: Viktor Serhieiev <email address hidden>
Closes-Bug: #1488456 8dbc24b92cd0b8f 8b7904c0ed4
Change-Id: If781c808b1f142