Merge pull request #1825 from mboutet/feature/remove-users-from-heart…

…beat

Remove `user_classes_count` from heartbeat payload

locust/runners.py

@@ -890,9 +890,6 @@ def client_listener(self):
                         logger.info(
                             "Worker %s self-healed with heartbeat, setting state to %s." % (str(c.id), client_state)
                         )
-                        user_classes_count = msg.data.get("user_classes_count")
-                        if user_classes_count:
-                            c.user_classes_count = user_classes_count
                         if self._users_dispatcher is not None:
                             self._users_dispatcher.add_worker(worker_node=c)
                             if not self._users_dispatcher.dispatch_in_progress and self.state == STATE_RUNNING:
@@ -1080,7 +1077,6 @@ def heartbeat(self):
                         {
                             "state": self.worker_state,
                             "current_cpu_usage": self.current_cpu_usage,
-                            "user_classes_count": self.user_classes_count,
                         },
                         self.client_id,
                     )

locust/test/test_runners.py

@@ -2509,6 +2509,34 @@ def my_task(self):
 
             worker.quit()
 
+    def test_worker_heartbeat_messages_sent_to_master(self):
+        """
+        Validate content of the heartbeat payload sent to the master.
+        """
+
+        class MyUser(User):
+            wait_time = constant(1)
+
+            @task
+            def my_task(self):
+                pass
+
+        with mock.patch("locust.rpc.rpc.Client", mocked_rpc()) as client:
+            environment = Environment()
+            worker = self.get_runner(environment=environment, user_classes=[MyUser])
+
+            t0 = time.perf_counter()
+            while len([m for m in client.outbox if m.type == "heartbeat"]) == 0:
+                self.assertLessEqual(time.perf_counter() - t0, 3)
+                sleep(0.1)
+
+            message = next((m for m in reversed(client.outbox) if m.type == "heartbeat"))
+            self.assertEqual(len(message.data), 2)
+            self.assertIn("state", message.data)
+            self.assertIn("current_cpu_usage", message.data)
+
+            worker.quit()
+
     def test_change_user_count_during_spawning(self):
         class MyUser(User):
             wait_time = constant(1)