openstack/manila
Code Issues Proposed changes

Handle oslo.messaging ping endpoint

Browse Source 
We have a test that attempts to emulate a messaging endpoint and
fails if anything other than the endpoint's target property is
inspected. With the addition of the ping endpoint in
I51cf67e060f240e6eb82260e70a057fe599f9063, this now blows up
with the latest oslo.messaging release.

To handle this situation, our fake class just needs to also
check for the oslo_rpc_server_ping attribute.

Change-Id: I485c1724614abf03928b83280c88ffc4cdfdb1c4
Co-Authored-By: Sean McGinnis <sean.mcginnis@gmail.com>
Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com>
This commit is contained in:
Goutham Pacha Ravi 2020-09-08 11:20:41 -07:00
parent f6f8e2b1be
commit aecefee087
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manila/tests/test_test.py
View File

@ -37,10 +37,11 @@ class IsolationTestCase(test.TestCase):
class NeverCalled(object): class NeverCalled(object):
def __getattribute__(self, name): def __getattribute__(self, name):
if name == 'target': if name == 'target' or name == 'oslo_rpc_server_ping':
# oslo.messaging 5.31.0 explicitly looks for 'target' # oslo.messaging >=5.31.0 explicitly looks for 'target'
# on the endpoint and checks its type, so we can't avoid # on the endpoint and checks its type, so we can't avoid
# it here. Just ignore it if that's the case. # it here. In 12.4.0, the package added a ping endpoint
# Just ignore if either case.
return return
assert False, "I should never get called - name: %s" % name assert False, "I should never get called - name: %s" % name