locust 2.47.1.dev31__tar.gz → 2.47.1.dev35__tar.gz

{locust-2.47.1.dev31 → locust-2.47.1.dev35}/PKG-INFO

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

{locust-2.47.1.dev31 → locust-2.47.1.dev35}/locust/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.47.1.dev31'
-__version_tuple__ = version_tuple = (2, 47, 1, 'dev31')
+__version__ = version = '2.47.1.dev35'
+__version_tuple__ = version_tuple = (2, 47, 1, 'dev35')
 
 __commit_id__ = commit_id = None

{locust-2.47.1.dev31 → locust-2.47.1.dev35}/locust/stats.py

@@ -433,23 +433,7 @@ class StatsEntry:
 
     @property
     def median_response_time(self) -> int:
-        if not self.response_times:
-            return 0
-        median = (
-            calculate_response_time_percentile(self.response_times, self.num_requests - self.num_none_requests, 0.5)
-            or 0
-        )
-
-        # Since we only use two digits of precision when calculating the median response time
-        # while still using the exact values for min and max response times, the following checks
-        # makes sure that we don't report a median > max or median < min when a StatsEntry only
-        # have one (or very few) really slow requests
-        if median > self.max_response_time:
-            median = self.max_response_time
-        elif self.min_response_time is not None and median < self.min_response_time:
-            median = self.min_response_time
-
-        return median
+        return self.get_response_time_percentile(0.5)
 
     @property
     def current_rps(self) -> float:
@@ -609,10 +593,21 @@ class StatsEntry:
         """
         # response_times only holds non-None samples, so None (async) requests
         # must be excluded from the denominator, just like in avg/median
-        return calculate_response_time_percentile(
+        percentile = calculate_response_time_percentile(
             self.response_times, self.num_requests - self.num_none_requests, percent
         )
 
+        # Since we only use two digits of precision when calculating percentiles while still
+        # using the exact values for min and max response times, the following checks make sure
+        # that we don't report a percentile > max or percentile < min, e.g. a 95th percentile of
+        # 1500 when the slowest request took 1460
+        if percentile > self.max_response_time:
+            percentile = self.max_response_time
+        elif self.min_response_time is not None and percentile < self.min_response_time:
+            percentile = self.min_response_time
+
+        return percentile
+
     def get_current_response_time_percentile(self, percent: float) -> int | None:
         """
         Calculate the *current* response time for a certain percentile. We use a sliding

{locust-2.47.1.dev31 → locust-2.47.1.dev35}/locust/user/users.py

@@ -1,7 +1,14 @@
 from __future__ import annotations
 
 from locust.clients import HttpSession, RestResponseContextManager
-from locust.exception import CatchResponseError, StopTest, StopUser
+from locust.exception import (
+    CatchResponseError,
+    InterruptTaskSet,
+    RescheduleTask,
+    RescheduleTaskImmediately,
+    StopTest,
+    StopUser,
+)
 from locust.user.task import (
     LOCUST_STATE_RUNNING,
     LOCUST_STATE_STOPPING,
@@ -308,6 +315,8 @@ class RestMixin(Generic[RestResponseT]):
                 else:
                     resp.failure("Assertion failed")
 
+            except (StopUser, StopTest, RescheduleTask, RescheduleTaskImmediately, InterruptTaskSet):
+                raise
             except Exception as e:
                 error_lines = []
                 for l in traceback.format_exc().split("\n"):