locust 2.27.1.dev29__py3-none-any.whl → 2.27.1.dev35__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.dev29'
-__version_tuple__ = version_tuple = (2, 27, 1, 'dev29')
+__version__ = version = '2.27.1.dev35'
+__version_tuple__ = version_tuple = (2, 27, 1, 'dev35')

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_web.py

@@ -183,10 +183,17 @@ class TestWebUI(LocustTestCase, _HeaderCheckMixin):
         self._check_csv_headers(response.headers, "failures")
 
     def test_request_stats_with_errors(self):
-        self.stats.log_error("GET", "/", Exception("Error1337"))
+        self.stats.log_error("GET", "/", Exception("Error with special characters {'foo':'bar'}"))
         response = requests.get("http://127.0.0.1:%i/stats/requests" % self.web_port)
         self.assertEqual(200, response.status_code)
-        self.assertIn("Error1337", response.text)
+
+        # escaped, old school
+        # self.assertIn(
+        #     '"Exception("Error with special characters{'foo':'bar'}")"', response.text
+        # )
+
+        # not html escaping, leave that to the frontend
+        self.assertIn("\"Exception(\\\"Error with special characters {'foo':'bar'}\\\")", response.text)
 
     def test_reset_stats(self):
         try:

locust/web.py

@@ -396,11 +396,7 @@ class WebUI:
             for s in chain(sort_stats(environment.runner.stats.entries), [environment.runner.stats.total]):
                 stats.append(s.to_dict())
 
-            for e in environment.runner.errors.values():
-                err_dict = e.serialize()
-                err_dict["name"] = escape(err_dict["name"])
-                err_dict["error"] = escape(err_dict["error"])
-                errors.append(err_dict)
+            errors = [e.serialize() for e in environment.runner.errors.values()]
 
             # Truncate the total number of stats and errors displayed since a large number of rows will cause the app
             # to render extremely slowly. Aggregate stats should be preserved.

{locust-2.27.1.dev29.dist-info → locust-2.27.1.dev35.dist-info}/METADATA

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

{locust-2.27.1.dev29.dist-info → locust-2.27.1.dev35.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=I6BTfLIphBjjt9ydexOJQNz7f8bA7p_9sx4GEtlDCaA,428
+locust/_version.py,sha256=1Qzx4x6QAncZ-BZr1VFJm149xaSi_W3Mk1QiQQEPvv0,428
 locust/argument_parser.py,sha256=w4-Ue1XAFPwG3sLyXrpdV9ejKjTUOpcSsPBbCKwRbiQ,28740
 locust/clients.py,sha256=YKuAyMAbxs8_-w7XJw0hc67KFBNNLxibsw6FwiS01Q8,14781
 locust/debug.py,sha256=We6Z9W0btkKSc7PxWmrZx-xMynvOOsKhG6jmDgQin0g,5134
@@ -15,8 +15,8 @@ locust/main.py,sha256=NGjL5QqakU5aeyUzwu2Fh00xVZfC3eoBE3DtfOmRtcM,27854
 locust/py.typed,sha256=gkWLl8yD4mIZnNYYAIRM8g9VarLvWmTAFeUfEbxJLBw,65
 locust/runners.py,sha256=Go8b8fpOAfFy6JuNcot7KyguHuExA6eoPHVmcgx3RoI,67813
 locust/shape.py,sha256=t-lwBS8LOjWcKXNL7j2U3zroIXJ1b0fazUwpRYQOKXw,1973
-locust/stats.py,sha256=-kI5fTGgs6w5FSaFYGhBAE2PnnCQWuBqmhYPTGPctTA,45558
-locust/web.py,sha256=DKYHrH2Aq3TJ-lKSjG15uEQH4MBlU_zqMZPclqoLtuU,27036
+locust/stats.py,sha256=IXhOtYJ_B863kyrHysNQmuFHv2Vd57vE3Rnerwp3bzs,45859
+locust/web.py,sha256=4XKB_5OJzugXC-YguBg19hhAk1vfOmuOg9UQc7Djkv8,26857
 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,7 +36,7 @@ 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
@@ -47,7 +47,7 @@ locust/test/test_taskratio.py,sha256=SQ-sBqeFm2GhkfCD_57-fPzQrk1ilSw3DRb0_nwyxAI
 locust/test/test_users.py,sha256=lp6yAKGK9_MIs9F7s1Vc3561P4oRavhpeVo2y9w3SUU,2135
 locust/test/test_util.py,sha256=DmFTgNSWWx8zrsx9_ZGO6MsySmBV1H_GzNIVzzyapCM,1229
 locust/test/test_wait_time.py,sha256=3evSEp6amMWFrzmSYs71MCeIsu7Rtarldb_HnwgSrU0,2353
-locust/test/test_web.py,sha256=8v1RFeF7GDXDv616uzI3adSxoYSxctoZinmwupX5-K8,45767
+locust/test/test_web.py,sha256=9FwA03MuR3q3-svU9rMc2gTBQ9t8T1Av1nIU27_dZqg,46100
 locust/test/test_zmqrpc.py,sha256=kONaZ11hwnneLwaVn7lIDVV7KHpEP2nkxuKhfb9ba3o,2173
 locust/test/testcases.py,sha256=ZaPYNxSSChAs0nts_13mCGY7WFW8AjXQZdPOvwAK0TY,6961
 locust/test/util.py,sha256=98HXLClkycNTxLiuy1d3W_tM6dBU9bA-p5ZXMfncaWE,2754
@@ -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.dev29.dist-info/LICENSE,sha256=78XGpIn3fHVBfaxlPNUfjVufSN7QsdhpJMRJHv2AFpo,1095
-locust-2.27.1.dev29.dist-info/METADATA,sha256=IRkXkEESVfmwdyPrWMCNRf9dZhxMr8ai9BsxJ_vbIJ4,7264
-locust-2.27.1.dev29.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-locust-2.27.1.dev29.dist-info/entry_points.txt,sha256=RAdt8Ku-56m7bFjmdj-MBhbF6h4NX7tVODR9QNnOg0E,44
-locust-2.27.1.dev29.dist-info/top_level.txt,sha256=XSsjgPA8Ggf9TqKVbkwSqZFuPlZ085X13M9orDycE20,7
-locust-2.27.1.dev29.dist-info/RECORD,,
+locust-2.27.1.dev35.dist-info/LICENSE,sha256=78XGpIn3fHVBfaxlPNUfjVufSN7QsdhpJMRJHv2AFpo,1095
+locust-2.27.1.dev35.dist-info/METADATA,sha256=Hk6qAOzjM_pIBtt3c3uzIYAN6zMhf7pvvfdSibBBlS4,7264
+locust-2.27.1.dev35.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+locust-2.27.1.dev35.dist-info/entry_points.txt,sha256=RAdt8Ku-56m7bFjmdj-MBhbF6h4NX7tVODR9QNnOg0E,44
+locust-2.27.1.dev35.dist-info/top_level.txt,sha256=XSsjgPA8Ggf9TqKVbkwSqZFuPlZ085X13M9orDycE20,7
+locust-2.27.1.dev35.dist-info/RECORD,,