From 91d31494d02ea636a991abb4dfb25dd904eefd45 Mon Sep 17 00:00:00 2001 From: Dana Powers Date: Tue, 2 Apr 2019 21:27:49 -0700 Subject: Do not call state_change_callback with lock (#1775) --- test/test_client_async.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'test/test_client_async.py') diff --git a/test/test_client_async.py b/test/test_client_async.py index 0951cb4..2132c8e 100644 --- a/test/test_client_async.py +++ b/test/test_client_async.py @@ -95,28 +95,29 @@ def test_conn_state_change(mocker, cli, conn): node_id = 0 cli._conns[node_id] = conn conn.state = ConnectionStates.CONNECTING - cli._conn_state_change(node_id, conn) + sock = conn._sock + cli._conn_state_change(node_id, sock, conn) assert node_id in cli._connecting - sel.register.assert_called_with(conn._sock, selectors.EVENT_WRITE) + sel.register.assert_called_with(sock, selectors.EVENT_WRITE) conn.state = ConnectionStates.CONNECTED - cli._conn_state_change(node_id, conn) + cli._conn_state_change(node_id, sock, conn) assert node_id not in cli._connecting - sel.modify.assert_called_with(conn._sock, selectors.EVENT_READ, conn) + sel.modify.assert_called_with(sock, selectors.EVENT_READ, conn) # Failure to connect should trigger metadata update assert cli.cluster._need_update is False - conn.state = ConnectionStates.DISCONNECTING - cli._conn_state_change(node_id, conn) + conn.state = ConnectionStates.DISCONNECTED + cli._conn_state_change(node_id, sock, conn) assert node_id not in cli._connecting assert cli.cluster._need_update is True - sel.unregister.assert_called_with(conn._sock) + sel.unregister.assert_called_with(sock) conn.state = ConnectionStates.CONNECTING - cli._conn_state_change(node_id, conn) + cli._conn_state_change(node_id, sock, conn) assert node_id in cli._connecting - conn.state = ConnectionStates.DISCONNECTING - cli._conn_state_change(node_id, conn) + conn.state = ConnectionStates.DISCONNECTED + cli._conn_state_change(node_id, sock, conn) assert node_id not in cli._connecting -- cgit v1.2.1