From de5629dcadfc6c0ca6e3ebdee6c345ae780ec140 Mon Sep 17 00:00:00 2001 From: Lars Holmberg Date: Fri, 28 Jan 2022 17:10:06 +0100 Subject: [PATCH 1/4] Revert "call quit method instead of quit event" This reverts commit 0ddb00eaee1cf558caa5f4128685dcf0785dfb80. --- locust/test/test_runners.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locust/test/test_runners.py b/locust/test/test_runners.py index 5859df15a1..a85a63a37c 100644 --- a/locust/test/test_runners.py +++ b/locust/test/test_runners.py @@ -940,7 +940,7 @@ 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.quit() + master_env.events.quitting.fire(environment=master_env, reverse=True) sleep(0.1) # make sure users are killed self.assertEqual(0, worker.user_count) From 76407cba3796d2b51352f72551b346ef6698e9cf Mon Sep 17 00:00:00 2001 From: Lars Holmberg Date: Fri, 28 Jan 2022 17:10:12 +0100 Subject: [PATCH 2/4] Revert "remove duplicated quit event" This reverts commit 85e60dbd0d8168a2028407595ce8bf6d12e370a8. --- locust/test/test_runners.py | 1 + 1 file changed, 1 insertion(+) diff --git a/locust/test/test_runners.py b/locust/test/test_runners.py index a85a63a37c..92bdf0076e 100644 --- a/locust/test/test_runners.py +++ b/locust/test/test_runners.py @@ -941,6 +941,7 @@ def _(*args, **kwargs): # 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 self.assertEqual(0, worker.user_count) From e053253e8db3a1a9dfb4f29bd45a23a83171b9fc Mon Sep 17 00:00:00 2001 From: Lars Holmberg Date: Fri, 28 Jan 2022 17:16:02 +0100 Subject: [PATCH 3/4] Revert "why raise error when call close func" This reverts commit 891b461d3561d6fbc69fa2ee3d052fa6f1648a9b. --- locust/test/test_runners.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locust/test/test_runners.py b/locust/test/test_runners.py index 92bdf0076e..5acc23f3a8 100644 --- a/locust/test/test_runners.py +++ b/locust/test/test_runners.py @@ -87,7 +87,7 @@ def recv_from_client(self): return msg.node_id, msg def close(self): - pass + raise RPCError() return MockedRpcServerClient From f6039f68d8f18b7747f5e1dd9d73cdeeff7b4678 Mon Sep 17 00:00:00 2001 From: Lars Holmberg Date: Fri, 28 Jan 2022 17:18:22 +0100 Subject: [PATCH 4/4] Revert "fix master runner not close rpc server" This reverts commit fc731f098d2aa3cddf277cae87227a4d0059b8de. --- locust/runners.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/locust/runners.py b/locust/runners.py index 61d9446c24..c64d14233d 100644 --- a/locust/runners.py +++ b/locust/runners.py @@ -825,9 +825,6 @@ 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() - # ensure heartbeat_worker doesnt try to re-establish connection to workers and throw lots of exceptions - self.clients._worker_nodes = {} self.greenlet.kill(block=True) def check_stopped(self):