locust 2.46.8.dev24__tar.gz → 2.46.8.dev32__tar.gz

{locust-2.46.8.dev24 → locust-2.46.8.dev32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: locust
-Version: 2.46.8.dev24
+Version: 2.46.8.dev32
 Summary: Developer-friendly load testing framework
 Project-URL: Homepage, https://locust.cloud/
 Project-URL: Repository, https://github.com/locustio/locust

{locust-2.46.8.dev24 → locust-2.46.8.dev32}/locust/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.46.8.dev24'
-__version_tuple__ = version_tuple = (2, 46, 8, 'dev24')
+__version__ = version = '2.46.8.dev32'
+__version_tuple__ = version_tuple = (2, 46, 8, 'dev32')
 
 __commit_id__ = commit_id = None

{locust-2.46.8.dev24 → locust-2.46.8.dev32}/locust/argument_parser.py

@@ -9,6 +9,7 @@ import ast
 import atexit
 import difflib
 import json
+import math
 import os
 import platform
 import socket
@@ -431,6 +432,8 @@ def positive_integer(string) -> int:
 def gt_zero(t):
     def checker(value):
         v = t(value)
+        if not math.isfinite(v):
+            raise argparse.ArgumentTypeError("must be a finite number")
         if v <= 0:
             raise argparse.ArgumentTypeError("must be > 0")
         return v

{locust-2.46.8.dev24 → locust-2.46.8.dev32}/locust/contrib/fasthttp.py

@@ -78,6 +78,7 @@ FAILURE_EXCEPTIONS = (
     SSLError,
     Timeout,
     HTTPConnectionClosed,
+    HTTPParseError,
     zlib.error,
 )
 
@@ -294,7 +295,7 @@ class FastHttpSession:
         else:
             try:
                 request_meta["response_length"] = len(response.content) if response.content else 0
-            except (HTTPParseError, *FAILURE_EXCEPTIONS) as e:
+            except FAILURE_EXCEPTIONS as e:
                 request_meta["response_time"] = (time.perf_counter() - start_perf_counter) * 1000
                 request_meta["exception"] = e  # type: ignore
                 if catch_response:

{locust-2.46.8.dev24 → locust-2.46.8.dev32}/locust/dispatch.py

@@ -198,6 +198,9 @@ class UsersDispatcher(Iterator):
         if spawn_rate <= 0:
             raise ValueError(f"spawn_rate must be > 0, got {spawn_rate}")
 
+        if not math.isfinite(spawn_rate):
+            raise ValueError(f"spawn_rate must be a finite number, got {spawn_rate}")
+
         if user_classes is not None and self._user_classes != sorted(user_classes, key=attrgetter("__name__")):
             self._user_classes = sorted(user_classes, key=attrgetter("__name__"))
             self._user_generator = self._user_gen()

{locust-2.46.8.dev24 → locust-2.46.8.dev32}/locust/html.py

@@ -21,7 +21,9 @@ def process_html_filename(options) -> None:
     }
     for option_term, option_value in option_mapping.items():
         if option_value is not None:
-            options.html_file = options.html_file.replace(option_term, str(int(option_value)))
+            # -r is a float option, so a fractional spawn rate must survive the substitution.
+            replacement = str(int(option_value)) if float(option_value).is_integer() else str(option_value)
+            options.html_file = options.html_file.replace(option_term, replacement)
 
 
 def render_template_from(file, build_path=DEFAULT_BUILD_PATH, **kwargs):

{locust-2.46.8.dev24 → locust-2.46.8.dev32}/locust/main.py

@@ -109,8 +109,14 @@ def merge_locustfiles_content(
         for _shape_class in shape_classes:
             shape_class_name = type(_shape_class).__name__
             if shape_class_name in available_shape_classes.keys():
-                sys.stderr.write(f"Duplicate shape classes: {shape_class_name}\n")
-                sys.exit(1)
+                previous_path = inspect.getfile(type(available_shape_classes[shape_class_name]))
+                new_path = inspect.getfile(type(_shape_class))
+                if previous_path == new_path:
+                    # The same shape class was defined in two locustfiles but one probably imported the other, so we just ignore it
+                    continue
+                else:
+                    sys.stderr.write(f"Duplicate shape classes: {shape_class_name}\n")
+                    sys.exit(1)
 
             available_shape_classes[shape_class_name] = _shape_class
 

{locust-2.46.8.dev24 → locust-2.46.8.dev32}/locust/web.py

@@ -4,6 +4,7 @@ import csv
 import itertools
 import json
 import logging
+import math
 import mimetypes
 import os.path
 from functools import wraps
@@ -340,7 +341,13 @@ class WebUI:
             self._cancel_run_time_timer()
 
             if environment.runner is not None:
-                if user_count is None or user_count < 0 or spawn_rate is None or spawn_rate <= 0:
+                if (
+                    user_count is None
+                    or user_count < 0
+                    or spawn_rate is None
+                    or spawn_rate <= 0
+                    or not math.isfinite(spawn_rate)
+                ):
                     err_msg = "Missing or invalid user_count or spawn_rate from /swarm request"
                     logger.error(err_msg)
                     return jsonify({"success": False, "message": err_msg, "host": environment.host})