fix inconsistency in zmqrpc

locustio · Mar 4, 2019 · 4257863 · 4257863
1 parent 97e51fe
commit 4257863
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/locust/rpc/zmqrpc.py b/locust/rpc/zmqrpc.py
@@ -21,7 +21,7 @@ def recv(self):
 
     def recv_from_client(self):
         data = self.socket.recv_multipart()
-        addr = data[0]
+        addr = data[0].decode()
         msg = Message.unserialize(data[1])
         return addr, msg
 

diff --git a/locust/test/test_zmqrpc.py b/locust/test/test_zmqrpc.py
@@ -17,12 +17,12 @@ def tearDown(self):
     def test_client_send(self):
         self.client.send(Message('test', 'message', 'identity'))
         addr, msg = self.server.recv_from_client()
-        self.assertEqual(addr, b'identity')
+        self.assertEqual(addr, 'identity')
         self.assertEqual(msg.type, 'test')
         self.assertEqual(msg.data, 'message')
 
     def test_client_recv(self):
-        sleep(0.01)
+        sleep(0.1)
         # We have to wait for the client to finish connecting 
         # before sending a msg to it.
         self.server.send_to_client(Message('test', 'message', 'identity'))