Skip to content

Commit

Permalink
Sleep after connect for router/dealer tests to ensure dealer is conne…
Browse files Browse the repository at this point in the history
…cted prior to message.
  • Loading branch information
langmm committed Jul 26, 2018
1 parent 4c963bf commit 91d0d5f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
3 changes: 3 additions & 0 deletions cis_interface/communication/tests/test_CommBase.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,14 @@ def test_msg(self):
def setup(self, *args, **kwargs):
r"""Initialize comm object pair."""
assert(self.is_installed)
sleep_after_connect = kwargs.pop('sleep_after_connect', False)
send_inst_kwargs = self.send_inst_kwargs
kwargs.setdefault('nprev_comm', self.comm_count)
kwargs.setdefault('nprev_fd', self.fd_count)
self.send_instance = new_comm(self.name, **send_inst_kwargs)
super(TestCommBase, self).setup(*args, **kwargs)
if sleep_after_connect:
self.send_instance.sleep()
# CommBase is dummy class that never opens
if self.comm in ['CommBase', 'AsyncComm']:
assert(not self.send_instance.is_open)
Expand Down
6 changes: 6 additions & 0 deletions cis_interface/communication/tests/test_ZMQComm.py
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,12 @@ def __init__(self, *args, **kwargs):
super(TestZMQCommROUTER, self).__init__(*args, **kwargs)
self.socket_type = 'ROUTER'

def setup(self, *args, **kwargs):
r"""Initialize comm object pair with sleep after setup to ensure
dealer has connected."""
kwargs['sleep_after_connect'] = True
super(TestZMQCommROUTER, self).setup(*args, **kwargs)

def test_router_recv(self):
r"""Test router receipt of message from the dealer with an identity."""
self.do_send_recv(reverse_comms=True, send_kwargs=dict(
Expand Down

0 comments on commit 91d0d5f

Please sign in to comment.