locust 2.29.1.dev31__tar.gz → 2.29.2.dev6__tar.gz

{locust-2.29.1.dev31 → locust-2.29.2.dev6}/CHANGELOG.md

@@ -1,6 +1,22 @@
 # Detailed changelog
 The most important changes can also be found in [the documentation](https://docs.locust.io/en/latest/changelog.html).
 
+## [2.29.1](https://github.com/locustio/locust/tree/2.29.1) (2024-06-25)
+
+[Full Changelog](https://github.com/locustio/locust/compare/2.29.0...2.29.1)
+
+**Fixed bugs:**
+
+- locust/webui/dist/index.html script errors. [\#2753](https://github.com/locustio/locust/issues/2753)
+
+**Merged pull requests:**
+
+- Option to Skip Monkey Patching with LOCUST\_SKIP\_MONKEY\_PATCH [\#2765](https://github.com/locustio/locust/pull/2765) ([andrewbaldwin44](https://github.com/andrewbaldwin44))
+- HttpSession: Improve error message when someone forgot to pass catch\_response=True + small optimization [\#2762](https://github.com/locustio/locust/pull/2762) ([cyberw](https://github.com/cyberw))
+- Add JavaScript to MIME types for Windows Operating Systems [\#2759](https://github.com/locustio/locust/pull/2759) ([andrewbaldwin44](https://github.com/andrewbaldwin44))
+- Add proxy support for FastHttpUser [\#2758](https://github.com/locustio/locust/pull/2758) ([NicoAdrian](https://github.com/NicoAdrian))
+- Httpsession requests typing [\#2699](https://github.com/locustio/locust/pull/2699) ([tdadela](https://github.com/tdadela))
+
 ## [2.29.0](https://github.com/locustio/locust/tree/2.29.0) (2024-06-07)
 
 [Full Changelog](https://github.com/locustio/locust/compare/2.28.0...2.29.0)

{locust-2.29.1.dev31 → locust-2.29.2.dev6}/PKG-INFO

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

{locust-2.29.1.dev31 → locust-2.29.2.dev6}/docs/changelog.rst

@@ -4,6 +4,12 @@ Changelog Highlights
 
 For full details of the Locust changelog, please see https://github.com/locustio/locust/blob/master/CHANGELOG.md
 
+2.29.1
+======
+* Add option to Skip Monkey Patching with LOCUST_SKIP_MONKEY_PATCH https://github.com/locustio/locust/pull/2765
+* HttpSession requests typing https://github.com/locustio/locust/pull/2699
+* Add proxy support for FastHttpUser https://github.com/locustio/locust/pull/2758
+
 2.29.0
 ======
 * Ensure spawning_complete only happens once on workers https://github.com/locustio/locust/pull/2728

{locust-2.29.1.dev31 → locust-2.29.2.dev6}/docs/increase-performance.rst

@@ -111,7 +111,7 @@ FastHttpUser class
 --------------------
 
 .. autoclass:: locust.contrib.fasthttp.FastHttpUser
-    :members: network_timeout, connection_timeout, max_redirects, max_retries, insecure, concurrency, client_pool, rest, rest_
+    :members: network_timeout, connection_timeout, max_redirects, max_retries, insecure, proxy_host, proxy_port, concurrency, client_pool, rest, rest_
 
 
 FastHttpSession class

{locust-2.29.1.dev31 → locust-2.29.2.dev6}/examples/fast_http_locust.py

@@ -14,6 +14,8 @@ class WebsiteUser(FastHttpUser):
     # max_redirects = 5
     # max_retries = 1
     # network_timeout = 60.0
+    # proxy_host = my-proxy.com
+    # proxy_port = 8080
 
     @task
     def index(self):

{locust-2.29.1.dev31 → locust-2.29.2.dev6}/locust/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.29.1.dev31'
-__version_tuple__ = version_tuple = (2, 29, 1, 'dev31')
+__version__ = version = '2.29.2.dev6'
+__version_tuple__ = version_tuple = (2, 29, 2, 'dev6')

{locust-2.29.1.dev31 → locust-2.29.2.dev6}/locust/clients.py

@@ -7,7 +7,7 @@ from typing import TYPE_CHECKING
 from urllib.parse import urlparse, urlunparse
 
 import requests
-from requests import Request, Response
+from requests import Response
 from requests.adapters import HTTPAdapter
 from requests.auth import HTTPBasicAuth
 from requests.exceptions import InvalidSchema, InvalidURL, MissingSchema, RequestException
@@ -54,8 +54,10 @@ absolute_http_url_regexp = re.compile(r"^https?://", re.I)
 
 
 class LocustResponse(Response):
-    def raise_for_status(self):
-        if hasattr(self, "error") and self.error:
+    error: Exception | None = None
+
+    def raise_for_status(self) -> None:
+        if self.error:
             raise self.error
         Response.raise_for_status(self)
 
@@ -112,7 +114,7 @@ class HttpSession(requests.Session):
         self.mount("https://", LocustHttpAdapter(pool_manager=pool_manager))
         self.mount("http://", LocustHttpAdapter(pool_manager=pool_manager))
 
-    def _build_url(self, path):
+    def _build_url(self, path) -> str:
         """prepend url with hostname unless it's already an absolute URL"""
         if absolute_http_url_regexp.match(path):
             return path
@@ -191,7 +193,7 @@ class HttpSession(requests.Session):
         response_time = (time.perf_counter() - start_perf_counter) * 1000
 
         request_before_redirect = (response.history and response.history[0] or response).request
-        url = request_before_redirect.url
+        url = request_before_redirect.url  # type: ignore
 
         if not name:
             name = request_before_redirect.path_url
@@ -225,7 +227,7 @@ class HttpSession(requests.Session):
                 pass
             return response
 
-    def _send_request_safe_mode(self, method, url, **kwargs):
+    def _send_request_safe_mode(self, method, url, **kwargs) -> Response | LocustResponse:
         """
         Send an HTTP request, and catch any exception that might occur due to connection problems.
 
@@ -238,8 +240,8 @@ class HttpSession(requests.Session):
         except RequestException as e:
             r = LocustResponse()
             r.error = e
-            r.status_code = 0  # with this status_code, content returns None
-            r.request = Request(method, url).prepare()
+            r.status_code = 0
+            r.request = e.request  # type: ignore
             return r
 
     def get(
@@ -440,17 +442,11 @@ class LocustHttpAdapter(HTTPAdapter):
 
 
 # Monkey patch Response class to give some guidance
-def _success(self):
-    raise LocustError(
-        "If you want to change the state of the request, you must pass catch_response=True. See http://docs.locust.io/en/stable/writing-a-locustfile.html#validating-responses"
-    )
-
-
-def _failure(self):
+def _missing_catch_response_True(self, *_args, **_kwargs):
     raise LocustError(
-        "If you want to change the state of the request, you must pass catch_response=True. See http://docs.locust.io/en/stable/writing-a-locustfile.html#validating-responses"
+        "If you want to change the state of the request using .success() or .failure(), you must pass catch_response=True. See http://docs.locust.io/en/stable/writing-a-locustfile.html#validating-responses"
     )
 
 
-Response.success = _success  # type: ignore[attr-defined]
-Response.failure = _failure  # type: ignore[attr-defined]
+Response.success = _missing_catch_response_True  # type: ignore[attr-defined]
+Response.failure = _missing_catch_response_True  # type: ignore[attr-defined]

{locust-2.29.1.dev31 → locust-2.29.2.dev6}/locust/contrib/fasthttp.py

@@ -157,7 +157,7 @@ class FastHttpSession:
         headers: dict | None = None,
         auth=None,
         json: dict | None = None,
-        allow_redirects=True,
+        allow_redirects: bool = True,
         context: dict = {},
         **kwargs,
     ) -> ResponseContextManager | FastResponse:
@@ -187,6 +187,7 @@ class FastHttpSession:
             and can instead be consumed by accessing the stream attribute on the Response object.
             Another side effect of setting stream to True is that the time for downloading the response
             content will not be accounted for in the request time that is reported by Locust.
+        :param allow_redirects: (optional) Set to True by default.
         """
         # prepend url with hostname unless it's already an absolute URL
         built_url = self._build_url(url)
@@ -250,7 +251,7 @@ class FastHttpSession:
         # Record the consumed time
         # Note: This is intentionally placed after we record the content_size above, since
         # we'll then trigger fetching of the body (unless stream=True)
-        request_meta["response_time"] = int((time.perf_counter() - start_perf_counter) * 1000)
+        request_meta["response_time"] = (time.perf_counter() - start_perf_counter) * 1000
 
         if catch_response:
             return ResponseContextManager(response, environment=self.environment, request_meta=request_meta)
@@ -264,6 +265,7 @@ class FastHttpSession:
             return response
 
     def delete(self, url, **kwargs):
+        """Sends a DELETE request"""
         return self.request("DELETE", url, **kwargs)
 
     def get(self, url, **kwargs):
@@ -279,12 +281,12 @@ class FastHttpSession:
         return self.request("OPTIONS", url, **kwargs)
 
     def patch(self, url, data=None, **kwargs):
-        """Sends a POST request"""
+        """Sends a PATCH request"""
         return self.request("PATCH", url, data=data, **kwargs)
 
-    def post(self, url, data=None, **kwargs):
+    def post(self, url, data=None, json=None, **kwargs):
         """Sends a POST request"""
-        return self.request("POST", url, data=data, **kwargs)
+        return self.request("POST", url, data=data, json=json, **kwargs)
 
     def put(self, url, data=None, **kwargs):
         """Sends a PUT request"""
@@ -324,6 +326,12 @@ class FastHttpUser(User):
     Note that setting this value has no effect when custom client_pool was given, and you need to spawn a your own gevent pool
     to use it (as Users only have one greenlet). See test_fasthttp.py / test_client_pool_concurrency for an example."""
 
+    proxy_host: str | None = None
+    """Parameter passed to FastHttpSession"""
+
+    proxy_port: int | None = None
+    """Parameter passed to FastHttpSession"""
+
     client_pool: HTTPClientPool | None = None
     """HTTP client pool to use. If not given, a new pool is created per single user."""
 
@@ -355,6 +363,8 @@ class FastHttpUser(User):
             client_pool=self.client_pool,
             ssl_context_factory=self.ssl_context_factory,
             headers=self.default_headers,
+            proxy_host=self.proxy_host,
+            proxy_port=self.proxy_port,
         )
         """
         Instance of HttpSession that is created upon instantiation of User.

{locust-2.29.1.dev31 → locust-2.29.2.dev6}/locust.egg-info/PKG-INFO

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