Merge pull request #1935 from lizhaode/patch-1

fix master runner not close rpc server

locust/runners.py

@@ -824,6 +824,7 @@ def quit(self):
             logger.debug("Sending quit message to client %s" % (client.id))
             self.server.send_to_client(Message("quit", None, client.id))
         gevent.sleep(0.5)  # wait for final stats report from all workers
+        self.server.close()
         self.greenlet.kill(block=True)
 
     def check_stopped(self):

locust/test/test_runners.py

@@ -86,7 +86,7 @@ def recv_from_client(self):
             return msg.node_id, msg
 
         def close(self):
-            raise RPCError()
+            pass
 
     return MockedRpcServerClient
 
@@ -937,7 +937,6 @@ def _(*args, **kwargs):
             self.assertEqual(2, worker.user_count)
             # give time for users to generate stats, and stats to be sent to master
             sleep(0.1)
-            master_env.events.quitting.fire(environment=master_env, reverse=True)
             master.quit()
             sleep(0.1)
             # make sure users are killed