locust 2.27.1.dev31__py3-none-any.whl → 2.27.1.dev40__py3-none-any.whl

locust/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.27.1.dev31'
-__version_tuple__ = version_tuple = (2, 27, 1, 'dev31')
+__version__ = version = '2.27.1.dev40'
+__version_tuple__ = version_tuple = (2, 27, 1, 'dev40')

locust/runners.py

@@ -223,6 +223,9 @@ class Runner:
             new_users: list[User] = []
             while n < spawn_count:
                 new_user = self.user_classes_by_name[user_class](self.environment)
+                assert hasattr(
+                    new_user, "environment"
+                ), f"Attribute 'environment' is missing on user {user_class}. Perhaps you defined your own __init__ and forgot to call the base constructor? (super().__init__(*args, **kwargs))"
                 new_user.start(self.user_greenlets)
                 new_users.append(new_user)
                 n += 1

locust/stats.py

@@ -708,7 +708,10 @@ class StatsError:
 
     @classmethod
     def parse_error(cls, error: Exception | str | None) -> str:
-        string_error = repr(error)
+        if isinstance(error, str):
+            string_error = error
+        else:
+            string_error = repr(error)
         target = "object at 0x"
         target_index = string_error.find(target)
         if target_index < 0:
@@ -730,16 +733,19 @@ class StatsError:
 
     def to_name(self) -> str:
         error = self.error
-        if isinstance(error, CatchResponseError):
-            # standalone
-            unwrapped_error = error.args[0]
-        if isinstance(error, str) and error.startswith("CatchResponseError("):
-            # distributed
-            length = len("CatchResponseError(")
-            unwrapped_error = error[length:-1]
-        else:
-            # standalone, unwrapped exception
-            unwrapped_error = repr(error)
+        if isinstance(error, str):  # in distributed mode, all errors have been converted to strings
+            if error.startswith("CatchResponseError("):
+                # unwrap CatchResponseErrors
+                length = len("CatchResponseError(")
+                unwrapped_error = error[length:-1]
+            else:
+                unwrapped_error = error
+        else:  # in standalone mode, errors are still objects
+            if isinstance(error, CatchResponseError):
+                # unwrap CatchResponseErrors
+                unwrapped_error = error.args[0]
+            else:
+                unwrapped_error = repr(error)
 
         return f"{self.method} {self.name}: {unwrapped_error}"
 

locust/test/test_main.py

@@ -2129,6 +2129,8 @@ class AnyUser(HttpUser):
             self.assertIn("(index 3) reported as ready", stderr)
             self.assertIn("The last worker quit, stopping test", stderr)
             self.assertIn("Shutting down (exit code 0)", stderr)
+            # ensure no weird escaping in error report. Not really related to ctrl-c...
+            self.assertIn(", 'Connection refused') ", stderr)
 
     @unittest.skipIf(os.name == "nt", reason="--processes doesnt work on windows")
     def test_workers_shut_down_if_master_is_gone(self):

locust/test/test_runners.py

@@ -144,6 +144,24 @@ class LocustRunnerTestCase(LocustTestCase):
 
 
 class TestLocustRunner(LocustRunnerTestCase):
+    def test_missing_constructor_call_in_user(self):
+        class BadUser(User):
+            def __init__(self, *args, **kwargs):
+                pass  # not calling base class constructor!!!
+
+            @task
+            def t(self):
+                pass
+
+        environment = Environment(user_classes=[BadUser])
+        runner = LocalRunner(environment)
+        with self.assertRaises(AssertionError) as assert_raises_context:
+            runner.spawn_users({BadUser.__name__: 1})
+        self.assertIn(
+            "Attribute 'environment' is missing on user BadUser. Perhaps you defined your own __init__ and forgot to call the base constructor",
+            str(assert_raises_context.exception),
+        )
+
     def test_cpu_warning(self):
         _monitor_interval = runners.CPU_MONITOR_INTERVAL
         runners.CPU_MONITOR_INTERVAL = 2.0

locust/web.py

@@ -147,7 +147,10 @@ class WebUI:
         def handle_exception(error):
             error_message = str(error)
             error_code = getattr(error, "code", 500)
-            logger.log(logging.INFO if error_code <= 404 else logging.ERROR, error_message)
+            logger.log(
+                logging.INFO if error_code <= 404 else logging.ERROR,
+                f"UI got request for {request.path}, but it resulted in a {error.code}: {error.name}",
+            )
             return make_response(error_message, error_code)
 
         @app.route("/assets/<path:path>")

{locust-2.27.1.dev31.dist-info → locust-2.27.1.dev40.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: locust
-Version: 2.27.1.dev31
+Version: 2.27.1.dev40
 Summary: Developer-friendly load testing framework
 License: MIT
 Project-URL: Homepage, https://github.com/locustio/locust

{locust-2.27.1.dev31.dist-info → locust-2.27.1.dev40.dist-info}/RECORD

@@ -1,6 +1,6 @@
 locust/__init__.py,sha256=g6oA-Ba_hs3gLWVf5MKJ1mvfltI8MFnDWG8qslqm8yg,1402
 locust/__main__.py,sha256=vBQ82334kX06ImDbFlPFgiBRiLIinwNk3z8Khs6hd74,31
-locust/_version.py,sha256=HNXUelTsGm6bsluVLMgm9poEZdP4iGkdzm3eDBkNMKQ,428
+locust/_version.py,sha256=3uMMGoO04UD8xBt4WrGeqL6Lo4R5EgC72VHpkOTnU-8,428
 locust/argument_parser.py,sha256=w4-Ue1XAFPwG3sLyXrpdV9ejKjTUOpcSsPBbCKwRbiQ,28740
 locust/clients.py,sha256=YKuAyMAbxs8_-w7XJw0hc67KFBNNLxibsw6FwiS01Q8,14781
 locust/debug.py,sha256=We6Z9W0btkKSc7PxWmrZx-xMynvOOsKhG6jmDgQin0g,5134
@@ -13,10 +13,10 @@ locust/input_events.py,sha256=ZIyePyAMuA_YFYWg18g_pE4kwuQV3RbEB250MzXRwjY,3314
 locust/log.py,sha256=cqLt7nnxnQuM4vWFB5EpJpNUTxGBVEkUJuaJPI1S7_Y,3186
 locust/main.py,sha256=NGjL5QqakU5aeyUzwu2Fh00xVZfC3eoBE3DtfOmRtcM,27854
 locust/py.typed,sha256=gkWLl8yD4mIZnNYYAIRM8g9VarLvWmTAFeUfEbxJLBw,65
-locust/runners.py,sha256=Go8b8fpOAfFy6JuNcot7KyguHuExA6eoPHVmcgx3RoI,67813
+locust/runners.py,sha256=kbEJtHVbDyQnd4IFo0GogasiZKWGXqFgiOiKt3aMjxw,68083
 locust/shape.py,sha256=t-lwBS8LOjWcKXNL7j2U3zroIXJ1b0fazUwpRYQOKXw,1973
-locust/stats.py,sha256=-kI5fTGgs6w5FSaFYGhBAE2PnnCQWuBqmhYPTGPctTA,45558
-locust/web.py,sha256=4XKB_5OJzugXC-YguBg19hhAk1vfOmuOg9UQc7Djkv8,26857
+locust/stats.py,sha256=IXhOtYJ_B863kyrHysNQmuFHv2Vd57vE3Rnerwp3bzs,45859
+locust/web.py,sha256=5Zj8nTa3Kr0aLhC1bXjZ5bissSOddYFQnIw8NOFUdPI,26976
 locust/contrib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 locust/contrib/fasthttp.py,sha256=vByPepw35DF84qZ2xK89yHgjOA_8btV0wig_rSR6p4g,26757
 locust/rpc/__init__.py,sha256=nVGoHWFQxZjnhCDWjbgXIbmFbN9sizAjkhvSs9_642c,58
@@ -36,10 +36,10 @@ locust/test/test_interruptable_task.py,sha256=LZKSV-aJNnwfvAxguz6SckBEuGEnfGimoI
 locust/test/test_load_locustfile.py,sha256=v-muHoM-CYu8t7DXm4AQtFP2q8RYfnTTUBqj7uVqhig,8494
 locust/test/test_locust_class.py,sha256=oGhhOX848jHRQnIfFlhLlW-kHGYLyYsfDX8hM07Ro7g,25506
 locust/test/test_log.py,sha256=YPY6vgTAy1KaNU2qoVvQrTH5x_mzRrljEHrkSBy3yxs,7553
-locust/test/test_main.py,sha256=R2akeBreg6aXC2Dhs-HxvFq_0EE64hzEaIZmAVALW4w,84866
+locust/test/test_main.py,sha256=7OuH2-7noD_rbeoKJD9hIZsylSugu7ze3XFIrU1u0HI,85016
 locust/test/test_old_wait_api.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 locust/test/test_parser.py,sha256=-2VO5Dopg-VoWvIgXrmr7GN40cqrnjUoctBHmVlyewg,17826
-locust/test/test_runners.py,sha256=xfBdRPOH1CiNk4Rwqmbx6S1e2BDuWdtqDw9omDJ50Ec,159395
+locust/test/test_runners.py,sha256=UWHmQW59QV1ZQzHRZjFIZiSW8ROUIVCuUgU-VAwOpH8,160110
 locust/test/test_sequential_taskset.py,sha256=QjVMWWfGHn9hU5AvPxRDU7Vo5DcVW1VkMVfDA0k9OPE,3398
 locust/test/test_stats.py,sha256=F51VkL3k3y4OhYBlRyV6vWzisenSAOmSWKy2IPVrnWM,33929
 locust/test/test_tags.py,sha256=mzhGLPMizSnSItTHLHizYvloxDfuIDAOgelwInyrf28,13138
@@ -70,9 +70,9 @@ locust/webui/dist/report.html,sha256=sOdZZVgZbqgu86BBCSQf3uQUYXgmgSnXF32JpnyAII8
 locust/webui/dist/assets/favicon.ico,sha256=IUl-rYqfpHdV38e-s0bkmFIeLS-n3Ug0DQxk-h202hI,8348
 locust/webui/dist/assets/index-941b6e82.js,sha256=G3n5R81Svt0HzbWaV3AV20jLWGLr4X50UZ-Adu2KcxU,1645614
 locust/webui/dist/assets/logo.png,sha256=EIVPqr6wE_yqguHaqFHIsH0ZACLSrvNWyYO7PbyIj4w,19299
-locust-2.27.1.dev31.dist-info/LICENSE,sha256=78XGpIn3fHVBfaxlPNUfjVufSN7QsdhpJMRJHv2AFpo,1095
-locust-2.27.1.dev31.dist-info/METADATA,sha256=YpVC6vJUygCNZ3NsEaEHhuP9pxMl2M-IZW1NpGdvLtw,7264
-locust-2.27.1.dev31.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-locust-2.27.1.dev31.dist-info/entry_points.txt,sha256=RAdt8Ku-56m7bFjmdj-MBhbF6h4NX7tVODR9QNnOg0E,44
-locust-2.27.1.dev31.dist-info/top_level.txt,sha256=XSsjgPA8Ggf9TqKVbkwSqZFuPlZ085X13M9orDycE20,7
-locust-2.27.1.dev31.dist-info/RECORD,,
+locust-2.27.1.dev40.dist-info/LICENSE,sha256=78XGpIn3fHVBfaxlPNUfjVufSN7QsdhpJMRJHv2AFpo,1095
+locust-2.27.1.dev40.dist-info/METADATA,sha256=H6rAgduxpQhRMeW1XsN2UgZNOJIp_JBC_XeWhAa0Hew,7264
+locust-2.27.1.dev40.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+locust-2.27.1.dev40.dist-info/entry_points.txt,sha256=RAdt8Ku-56m7bFjmdj-MBhbF6h4NX7tVODR9QNnOg0E,44
+locust-2.27.1.dev40.dist-info/top_level.txt,sha256=XSsjgPA8Ggf9TqKVbkwSqZFuPlZ085X13M9orDycE20,7
+locust-2.27.1.dev40.dist-info/RECORD,,