Merge pull request #1683 from max-rocket-internet/shape_headless_exit

Shutdown workers when using LoadTestShape and headless mode

locust/main.py

@@ -340,7 +340,7 @@ def timelimit_stop():
     if options.run_time:
         logger.info("Run time limit set to %s seconds" % options.run_time)
         spawn_run_time_limit_greenlet()
-    elif options.headless and not options.worker:
+    elif options.headless and not options.worker and not environment.shape_class:
         logger.info("No run time limit set, use CTRL+C to interrupt.")
     else:
         pass  # dont log anything - not having a time limit is normal when not running headless

locust/runners.py

@@ -330,7 +330,10 @@ def shape_worker(self):
             new_state = self.environment.shape_class.tick()
             if new_state is None:
                 logger.info("Shape test stopping")
-                self.stop()
+                if self.environment.parsed_options.headless:
+                    self.quit()
+                else:
+                    self.stop()
             elif self.shape_last_state == new_state:
                 gevent.sleep(1)
             else:

locust/test/test_main.py

@@ -279,6 +279,7 @@ def tick(self):
             )
             self.assertIn("Shape test updating to 10 users at 1.00 spawn rate", output)
             self.assertIn("Cleaning up runner...", output)
+            self.assertIn("Quitting...", output)
 
     def test_web_options(self):
         port = get_free_tcp_port()