locust 2.26.1.dev7__py3-none-any.whl → 2.26.1.dev16__py3-none-any.whl

locust/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.26.1.dev7'
-__version_tuple__ = version_tuple = (2, 26, 1, 'dev7')
+__version__ = version = '2.26.1.dev16'
+__version_tuple__ = version_tuple = (2, 26, 1, 'dev16')

locust/input_events.py

@@ -56,7 +56,7 @@ class WindowsKeyPoller:
                 self.cur_keys_length = 0
                 self.captured_chars = []
             except pywintypes.error:
-                raise InitError("Terminal says its a tty but we couldnt enable line input. Keyboard input disabled.")
+                raise InitError("Terminal says its a tty but we couldn't enable line input. Keyboard input disabled.")
         else:
             raise InitError("Terminal was not a tty. Keyboard input disabled")
 

locust/main.py

@@ -220,7 +220,7 @@ def main():
                 children.append(child_pid)
                 logging.debug(f"Started child worker with pid #{child_pid}")
             else:
-                # child is always a worker, even when it wasnt set on command line
+                # child is always a worker, even when it wasn't set on command line
                 options.worker = True
                 # remove options that dont make sense on worker
                 options.run_time = None
@@ -286,7 +286,7 @@ def main():
                         exit_code = max(exit_code, child_exit_code)
                     if exit_code > 1:
                         logging.error(f"Bad response code from worker children: {exit_code}")
-                    # ensure master doesnt finish until output from workers has arrived
+                    # ensure master doesn't finish until output from workers has arrived
                     # otherwise the terminal might look weird.
                     time.sleep(0.1)
 
@@ -433,8 +433,7 @@ See https://github.com/locustio/locust/wiki/Installation#increasing-maximum-numb
 
     if options.run_time:
         if options.worker:
-            logger.error("--run-time should be specified on the master node, and not on worker nodes")
-            sys.exit(1)
+            logger.info("--run-time specified for a worker node will be ignored.")
         try:
             options.run_time = parse_timespan(options.run_time)
         except ValueError:

locust/runners.py

@@ -378,7 +378,7 @@ class Runner:
             caller = inspect.getframeinfo(inspect.stack()[1][0])
             logger.debug(f"Stopping all users (called from {caller.filename}:{caller.lineno})")
         except Exception:
-            logger.debug("Stopping all users (couldnt determine where stop() was called from)")
+            logger.debug("Stopping all users (couldn't determine where stop() was called from)")
         self.environment.events.test_stopping.fire(environment=self.environment)
         self.final_user_classes_count = {**self.user_classes_count}
         self.update_state(STATE_CLEANUP)

locust/test/test_main.py

@@ -832,7 +832,7 @@ class StandaloneIntegrationTests(ProcessIntegrationTest):
     def test_web_options(self):
         port = get_free_tcp_port()
         if platform.system() != "Darwin":
-            # MacOS only sets up the loopback interface for 127.0.0.1 and not for 127.*.*.*, so we cant test this
+            # MacOS only sets up the loopback interface for 127.0.0.1 and not for 127.*.*.*, so we can't test this
             with mock_locustfile() as mocked:
                 proc = subprocess.Popen(
                     ["locust", "-f", mocked.file_path, "--web-host", "127.0.0.2", "--web-port", str(port)],

locust/test/test_runners.py

@@ -3214,7 +3214,7 @@ class TestMasterRunner(LocustRunnerTestCase):
 
     def test_worker_sends_unrecognized_message_to_master(self):
         """
-        Validate master ignores message from worker when it cannot parse adddress info.
+        Validate master ignores message from worker when it cannot parse address info.
         """
 
         class TestUser(User):

locust/test/test_stats.py

@@ -367,7 +367,7 @@ class TestStatsPrinting(LocustTestCase):
         headlines = info[1].replace("# ", "#").split()
         # check number of columns in headlines vs table ascii separator
         self.assertEqual(len(headlines), len(info[2].split("|")))
-        # table ascii seprators
+        # table ascii separators
         self.assertEqual(info[2], info[-2])
 
 

locust/util/timespan.py

@@ -2,7 +2,7 @@ import re
 from datetime import timedelta
 
 
-def parse_timespan(time_str):
+def parse_timespan(time_str) -> int:
     """
     Parse a string representing a time span and return the number of seconds.
     Valid formats are: 20, 20s, 3m, 2h, 1h20m, 3h30m10s, etc.
@@ -18,8 +18,7 @@ def parse_timespan(time_str):
     parts = timespan_regex.match(time_str)
     if not parts:
         raise ValueError("Invalid time span format. Valid formats: 20, 20s, 3m, 2h, 1h20m, 3h30m10s, etc.")
-    parts = parts.groupdict()
-    time_params = {name: int(value) for name, value in parts.items() if value}
+    time_params = {name: int(value) for name, value in parts.groupdict().items() if value}
     if not time_params:
         raise ValueError("Invalid time span format. Valid formats: 20, 20s, 3m, 2h, 1h20m, 3h30m10s, etc.")
     return int(timedelta(**time_params).total_seconds())

locust/web.py

@@ -104,7 +104,7 @@ class WebUI:
         environment: Reference to the current Locust Environment
         host: Host/interface that the web server should accept connections to
         port: Port that the web server should listen to
-        web_login:  Enables a login page for the modern UI
+        web_login:  Enables a login page
         tls_cert: A path to a TLS certificate
         tls_key: A path to a TLS private key
         delayed_start: Whether or not to delay starting web UI until `start()` is called. Delaying web UI start
@@ -147,7 +147,7 @@ class WebUI:
         def handle_exception(error):
             error_message = str(error)
             logger.log(logging.CRITICAL, error_message)
-            return make_response(error_message, 500)
+            return make_response(error_message, getattr(error, "code", 500))
 
         @app.route("/assets/<path:path>")
         def send_assets(path):

{locust-2.26.1.dev7.dist-info → locust-2.26.1.dev16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: locust
-Version: 2.26.1.dev7
+Version: 2.26.1.dev16
 Summary: Developer friendly load testing framework
 License: MIT
 Project-URL: Homepage, https://github.com/locustio/locust
@@ -116,7 +116,7 @@ Locust's code base is intentionally kept small and doesn't solve everything out
 ## Authors
 
 * Maintainer: [Lars Holmberg](https://github.com/cyberw)
-* Modern UI: [Andrew Baldwin](https://github.com/andrewbaldwin44)
+* UI: [Andrew Baldwin](https://github.com/andrewbaldwin44)
 * Original creator: [Jonatan Heyman](https://github.com/heyman)
 * Massive thanks to [all of our contributors](https://github.com/locustio/locust/graphs/contributors)
 

{locust-2.26.1.dev7.dist-info → locust-2.26.1.dev16.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=3veUhUmsTLjhnzaNLqgswdPQDWWnCSjT1jJuKb3nAJQ,426
+locust/_version.py,sha256=zATBBES6mVEiFZ2s2JJ69GRnNnIRImZ5L4UYyTaBPqo,428
 locust/argument_parser.py,sha256=gOyB1rqEEFNVkhGa-oAuCxf573aB_lATSY9w6FlCbHk,32008
 locust/clients.py,sha256=-vKHkTkUQwYUXUpuROvHdiAbSbOPY8s4V7xFDF5KU1A,14819
 locust/debug.py,sha256=We6Z9W0btkKSc7PxWmrZx-xMynvOOsKhG6jmDgQin0g,5134
@@ -9,14 +9,14 @@ locust/env.py,sha256=nd6ui1bv6n-kkLkP3r61ZkskDY627dsKOAkYHhtOW7o,12472
 locust/event.py,sha256=xgNKbcejxy1TNUfIdgV75KgD2_BOwQmvjrJ4hWuydRw,7740
 locust/exception.py,sha256=jGgJ32ubuf4pWdlaVOkbh2Y0LlG0_DHi-lv3ib8ppOE,1791
 locust/html.py,sha256=IrOYxmmowzcO96c9fytzR4U0lifTJyMTA7Rd96WOXkk,5708
-locust/input_events.py,sha256=WZtjFMJQpPszxgqwZkxzRBOhygHIersHsvt-9S34M9k,3271
+locust/input_events.py,sha256=VQIrgXaoph3JgLo6REKtPBThEPUXYXG5Kcedly5aRYc,3272
 locust/log.py,sha256=2IVp9YL4ZPfWdj3sBFuOHfgneg3g7m7tUGR-sy2s3E8,3155
-locust/main.py,sha256=emuULU-y1SmHTLcLqfOiZn_SnZzWDcf_IYRmB4Yc348,28194
+locust/main.py,sha256=OEuiWI49TB3xfiyLh6G6-bnV3s11hSYNki173PSV4uw,28152
 locust/py.typed,sha256=gkWLl8yD4mIZnNYYAIRM8g9VarLvWmTAFeUfEbxJLBw,65
-locust/runners.py,sha256=CsT0J1RDANceL3BfF7L0nSvYdk9O20vGRy4gtef_Urw,67953
+locust/runners.py,sha256=7qJE6cHETFEOo7kr0vo_PN3bdfOIw-fbKrc2aPPrjKw,67954
 locust/shape.py,sha256=t-lwBS8LOjWcKXNL7j2U3zroIXJ1b0fazUwpRYQOKXw,1973
 locust/stats.py,sha256=l2cxxVre8dvA4MIOD_ZKNj_fYySz5gTGC2f9Rc4-CL0,46134
-locust/web.py,sha256=tgTRfzAxKBxudjhLkQr5JGppoEOD6hcmZ-i_rGvwOlQ,28245
+locust/web.py,sha256=zj0Lm3tQq0MhbeJ1oKROnvauNibwUSBXsTehw2q2nAA,28251
 locust/contrib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 locust/contrib/fasthttp.py,sha256=B_VofSuvb9cehQxlUZnLVvYAr2AquedxeALua4mVOuM,26749
 locust/rpc/__init__.py,sha256=nVGoHWFQxZjnhCDWjbgXIbmFbN9sizAjkhvSs9_642c,58
@@ -61,12 +61,12 @@ 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=lchekHHgQBsY5wOuKbjjVm7U8cJ9qzJWmGSUu_Ebw7k,83553
+locust/test/test_main.py,sha256=LOVES_hyNs9kftr9WYRIn6SrfeonAZC7lK4WWJHZOyM,83554
 locust/test/test_old_wait_api.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 locust/test/test_parser.py,sha256=R2RATAHVC1n4gRYZyRD3yO5P9QMFbruZ3A4dwaw8Up0,18287
-locust/test/test_runners.py,sha256=rtmm9cV82lc7jqEYW3FTM8CNmLlswTIPr9UbeE5vfPc,159382
+locust/test/test_runners.py,sha256=6FPd-3Glp5_xtVIE8yCHDonM0aYJ0A6He5KSxuWOk34,159381
 locust/test/test_sequential_taskset.py,sha256=QjVMWWfGHn9hU5AvPxRDU7Vo5DcVW1VkMVfDA0k9OPE,3398
-locust/test/test_stats.py,sha256=g5WXKbKtjtPxR_Ixukz04wZUsEC7RkHx5hCNHzofob4,33928
+locust/test/test_stats.py,sha256=F51VkL3k3y4OhYBlRyV6vWzisenSAOmSWKy2IPVrnWM,33929
 locust/test/test_tags.py,sha256=mzhGLPMizSnSItTHLHizYvloxDfuIDAOgelwInyrf28,13138
 locust/test/test_taskratio.py,sha256=SQ-sBqeFm2GhkfCD_57-fPzQrk1ilSw3DRb0_nwyxAI,2742
 locust/test/test_users.py,sha256=lp6yAKGK9_MIs9F7s1Vc3561P4oRavhpeVo2y9w3SUU,2135
@@ -88,16 +88,16 @@ locust/util/deprecation.py,sha256=pFipULkYFjYnuFSycJZ0s95r0CTSlvx8otGnqSu1bsQ,20
 locust/util/exception_handler.py,sha256=jTMyBq2a0O07fRjmqGkheyaPj58tUgnbbcjoesKGPws,797
 locust/util/load_locustfile.py,sha256=hn70KcIG8jHmZyuKv2pcEmwgWtOEu24Efeji1KRYNUE,2964
 locust/util/rounding.py,sha256=5haxR8mKhATqag6WvPby-MSRRgIw5Ob6thbyvMYZM7o,92
-locust/util/timespan.py,sha256=rrMk4AR5t9HA59GktWCvOsYBDhkKAwLkk0Orj-l2EGY,997
+locust/util/timespan.py,sha256=Y0LtnhUq2Mq19p04u0XtBlYQ_-S2cRvwRdgru8W9WhA,986
 locust/webui/dist/auth.html,sha256=xDquX2awbYPO0FHo0SUTeylBjwbwUWpu2_blXKD0J5s,501
 locust/webui/dist/index.html,sha256=7LG5sNTcH3Hu07hxAdlpSRTy5fCHq1tNekJo-ZfaWxI,901
 locust/webui/dist/report.html,sha256=sOdZZVgZbqgu86BBCSQf3uQUYXgmgSnXF32JpnyAII8,513
 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.26.1.dev7.dist-info/LICENSE,sha256=78XGpIn3fHVBfaxlPNUfjVufSN7QsdhpJMRJHv2AFpo,1095
-locust-2.26.1.dev7.dist-info/METADATA,sha256=oYWSG2mlrlNKusKZA-2gpX6rhfhmMjBFiZfBWLcr3ms,7253
-locust-2.26.1.dev7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-locust-2.26.1.dev7.dist-info/entry_points.txt,sha256=RAdt8Ku-56m7bFjmdj-MBhbF6h4NX7tVODR9QNnOg0E,44
-locust-2.26.1.dev7.dist-info/top_level.txt,sha256=XSsjgPA8Ggf9TqKVbkwSqZFuPlZ085X13M9orDycE20,7
-locust-2.26.1.dev7.dist-info/RECORD,,
+locust-2.26.1.dev16.dist-info/LICENSE,sha256=78XGpIn3fHVBfaxlPNUfjVufSN7QsdhpJMRJHv2AFpo,1095
+locust-2.26.1.dev16.dist-info/METADATA,sha256=T-wQ7Bi9iJNdyPj0xvjWXgF7ot7QsKNj_19dZiCI7kM,7247
+locust-2.26.1.dev16.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+locust-2.26.1.dev16.dist-info/entry_points.txt,sha256=RAdt8Ku-56m7bFjmdj-MBhbF6h4NX7tVODR9QNnOg0E,44
+locust-2.26.1.dev16.dist-info/top_level.txt,sha256=XSsjgPA8Ggf9TqKVbkwSqZFuPlZ085X13M9orDycE20,7
+locust-2.26.1.dev16.dist-info/RECORD,,