locust 2.26.1.dev12__tar.gz → 2.26.1.dev26__tar.gz

{locust-2.26.1.dev12 → locust-2.26.1.dev26}/.vscode/settings.json

@@ -37,6 +37,12 @@
     "restructuredtext.confPath": "${workspaceFolder}/docs",
     "[python]": {
         "editor.formatOnSave": true,
+        "editor.codeActionsOnSave": {
+            "source.fixAll": "explicit",
+            "source.organizeImports": "explicit"
+        },
         "editor.defaultFormatter": "charliermarsh.ruff"
     },
+    "python.testing.pytestEnabled": false,
+    "python.testing.unittestEnabled": true
 }

{locust-2.26.1.dev12/locust.egg-info → locust-2.26.1.dev26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: locust
-Version: 2.26.1.dev12
+Version: 2.26.1.dev26
 Summary: Developer friendly load testing framework
 License: MIT
 Project-URL: Homepage, https://github.com/locustio/locust
@@ -105,7 +105,7 @@ Locust's code base is intentionally kept small and doesn't solve everything out
 * [Send real time reporting data to TimescaleDB and visualize it in Grafana](https://github.com/SvenskaSpel/locust-plugins/blob/master/locust_plugins/dashboards/README.md)
 * [Wrap calls to handle the peculiarities of your REST API](https://github.com/SvenskaSpel/locust-plugins/blob/8af21862d8129a5c3b17559677fe92192e312d8f/examples/rest_ex.py#L87) 
 * [Use a totally custom load shape/profile](https://docs.locust.io/en/latest/custom-load-shape.html#custom-load-shape)
-* ...
+* [...](https://github.com/locustio/locust/wiki/Extensions)
 
 ## Links
 
@@ -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.dev12 → locust-2.26.1.dev26}/README.md

@@ -62,7 +62,7 @@ Locust's code base is intentionally kept small and doesn't solve everything out
 * [Send real time reporting data to TimescaleDB and visualize it in Grafana](https://github.com/SvenskaSpel/locust-plugins/blob/master/locust_plugins/dashboards/README.md)
 * [Wrap calls to handle the peculiarities of your REST API](https://github.com/SvenskaSpel/locust-plugins/blob/8af21862d8129a5c3b17559677fe92192e312d8f/examples/rest_ex.py#L87) 
 * [Use a totally custom load shape/profile](https://docs.locust.io/en/latest/custom-load-shape.html#custom-load-shape)
-* ...
+* [...](https://github.com/locustio/locust/wiki/Extensions)
 
 ## Links
 
@@ -73,7 +73,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.dev12 → locust-2.26.1.dev26}/docs/changelog.rst

@@ -274,7 +274,7 @@ For full details of the Locust changelog, please see https://github.com/locustio
 =====
 * Pass --tags and --exclude-tags to workers. (https://github.com/locustio/locust/pull/1976)
 * Clean up some logging messages (https://github.com/locustio/locust/pull/1973)
-* Ensure heartbeat\_worker doesnt try to re-establish connection to workers when quit has been called (https://github.com/locustio/locust/pull/1972)
+* Ensure heartbeat\_worker doesn't try to re-establish connection to workers when quit has been called (https://github.com/locustio/locust/pull/1972)
 * fixed\_count: ability to spawn a specific number of users \(as opposed to just using weights\) (https://github.com/locustio/locust/pull/1964)
 
 2.5.1
@@ -654,7 +654,7 @@ Other breaking changes
 Web UI improvements
 -------------------
 
-* It's now possible to protect the Web UI with Basic Auth using hte ``--web-auth`` command line argument.
+* It's now possible to protect the Web UI with Basic Auth using the ``--web-auth`` command line argument.
 * The Web UI can now be served over HTTPS by specifying a TLS certificate and key with the ``--tls-cert`` 
   and ``--tls-key`` command line arguments.
 * If the number of users and hatch rate are specified on command line, it's now used to pre-populate the input fields in 
@@ -709,7 +709,7 @@ Identical to previous version, but now built & deployed to Pypi using Travis.
 0.13.2
 ======
 
-* Fixed bug that broke the Web UI's repsonse time graph
+* Fixed bug that broke the Web UI's response time graph
 
 0.13.1
 ======
@@ -786,7 +786,7 @@ Identical to previous version, but now built & deployed to Pypi using Travis.
 * Added sequential task support - https://github.com/locustio/locust/pull/827
 * Added support for user-defined wait_function - https://github.com/locustio/locust/pull/785
 * By default, Locust no longer resets the statistics when the hatching is complete.
-  Therefore :code:`--no-reset-stats` has been deprected (since it's now the default behaviour),
+  Therefore :code:`--no-reset-stats` has been deprecated (since it's now the default behavior),
   and instead a new :code:`--reset-stats` option has been added.
 * Dropped support for Python 3.3
 * Updated documentation
@@ -803,7 +803,7 @@ Identical to previous version, but now built & deployed to Pypi using Travis.
 
 * Python 3 support
 * Dropped support for Python 2.6
-* Added :code:`--no-reset-stats` option for controling if the statistics should be reset once
+* Added :code:`--no-reset-stats` option for controlling if the statistics should be reset once
   the hatching is complete
 * Added charts to the web UI for requests per second, average response time, and number of
   simulated users.
@@ -851,7 +851,7 @@ Identical to previous version, but now built & deployed to Pypi using Travis.
 * Fixed bug which caused the download time of the request body not to be included in the
   reported response time.
 * Fixed bug that occurred on some linux dists that were tampering with the python-requests
-  system package (removing dependencies which requests is bundling). This bug only occured
+  system package (removing dependencies which requests is bundling). This bug only occurred
   when installing Locust in the python system packages, and not when using virtualenv.
 * Various minor fixes and improvements.
 
@@ -859,7 +859,7 @@ Identical to previous version, but now built & deployed to Pypi using Travis.
 0.7.1
 =====
 
-* Exceptions that occurs within TaskSets are now catched by default.
+* Exceptions that occurs within TaskSets are now caught by default.
 * Fixed bug which caused Min response time to always be 0 after all locusts had been hatched
   and the statistics had been reset.
 * Minor UI improvements in the web interface.
@@ -875,7 +875,7 @@ HTTP client functionality moved to HttpLocust
 ---------------------------------------------
 
 Previously, the Locust class instantiated a :py:class:`HttpSession <locust.clients.HttpSession>`
-under the client attribute that was used to make HTTP requests. This funcionality has
+under the client attribute that was used to make HTTP requests. This functionality has
 now been moved into the :py:class:`HttpLocust <locust.core.HttpLocust>` class, in an
 effort to make it more obvious how one can use Locust to
 :doc:`load test non-HTTP systems <testing-other-systems>`.
@@ -1007,7 +1007,7 @@ Other changes
     Anyone who is currently using existing locust scripts and want to upgrade to 0.6
     should read through these changes.
 
-:py:class:`SubLocust <locust.core.SubLocust>` replaced by :py:class:`TaskSet <locust.core.TaskSet>` and :py:class:`Locust <locust.core.Locust>` class behaviour changed
+:py:class:`SubLocust <locust.core.SubLocust>` replaced by :py:class:`TaskSet <locust.core.TaskSet>` and :py:class:`Locust <locust.core.Locust>` class behavior changed
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 :py:class:`Locust <locust.core.Locust>` classes does no longer control task scheduling and execution.
@@ -1085,7 +1085,7 @@ Locust now uses Requests
 Locust's own HttpBrowser class (which was typically accessed through *self.client* from within a locust class)
 has been replaced by a thin wrapper around the requests library (http://python-requests.org). This comes with
 a number of advantages. Users can  now take advantage of a well documented, well written, fully fledged
-library for making HTTP requests. However, it also comes with some small API changes wich will require users
+library for making HTTP requests. However, it also comes with some small API changes which will require users
 to update their existing load testing scripts.
 
 Gzip encoding turned on by default
@@ -1192,7 +1192,7 @@ Smaller API Changes
 API changes
 -----------
 
-* Web inteface is now turned on by default. The **--web** command line option has been replaced by --no-web.
+* Web interface is now turned on by default. The **--web** command line option has been replaced by --no-web.
 * :func:`locust.events.request_success`  and :func:`locust.events.request_failure` now gets the HTTP method as the first argument.
 
 Improvements and bug fixes

{locust-2.26.1.dev12 → locust-2.26.1.dev26}/docs/configuration.rst

@@ -161,7 +161,7 @@ Running Locust with User class UI picker
 ========================================
 
 You can select which Shape class and which User classes to run in the WebUI when running locust with the ``--class-picker`` flag.
-No selection uses all of the available User classes.
+No selection uses all the available User classes.
 
 Example:
 
@@ -193,10 +193,9 @@ The Web UI will display:
 
 |
 
-With the new ``--modern-ui``, the class picker will addtionally allow for configuring any settings for each selected user.
-This includes selecting tasks, configuring the weight or fixed count, and configuring the host.
+The class picker additionally allows for disabling individual User tasks, changing the weight or fixed count, and configuring the host.
 
-It is even possible to add custom arguments that you wish to be configurable for each user. Simply add a ``json`` classethod
+It is even possible to add custom arguments that you wish to be configurable for each user. Simply add a ``json`` classmethod
 to your user:
 
 .. code-block:: python
@@ -216,8 +215,8 @@ to your user:
 Configuration for the User classes
 ==================================
 
-You can configure any settings you may wish for each user on the command line, the same as you may in the modern UI.
-Using the ``--config-users`` argument, you may pass a JSON string or file with your user configuration. To configure
+You can configure any settings you may wish for each user on the command line, the same as you may in the UI.
+Using the ``--config-users`` argument, you can also pass a JSON string or file with your user configuration. To configure
 multiple users you pass multiple arguments to ``--config-users`` or use a JSON Array.
 
 Each user settings object must contain a key ``user_class_name``. This key corresponds to the class that you wish
@@ -269,10 +268,9 @@ The list of statistics parameters that can be modified is:
 +-------------------------------------------+--------------------------------------------------------------------------------------+
 | PERCENTILES_TO_REPORT                     | List of response time percentiles to be calculated & reported                        |
 +-------------------------------------------+--------------------------------------------------------------------------------------+
-| PERCENTILES_TO_CHART                      | List of response time percentiles in the screen of chart for Web UI                  |
+| PERCENTILES_TO_CHART                      | List of response time percentiles in the screen of chart for UI                      |
 +-------------------------------------------+--------------------------------------------------------------------------------------+
-| MODERN_UI_PERCENTILES_TO_CHART            | List of response time percentiles in the screen of chart for the modern Web UI       |
+| MODERN_UI_PERCENTILES_TO_CHART            | List of response time percentiles in the screen of chart for the UI                  |
 +-------------------------------------------+--------------------------------------------------------------------------------------+
-| PERCENTILES_TO_STATISTICS                 | List of response time percentiles in the screen of statistics for Web UI             |
-|                                           | This parameter supports only modern UI                                               |
+| PERCENTILES_TO_STATISTICS                 | List of response time percentiles in the screen of statistics for UI                 |
 +-------------------------------------------+--------------------------------------------------------------------------------------+

{locust-2.26.1.dev12 → locust-2.26.1.dev26}/docs/custom-load-shape.rst

@@ -101,8 +101,8 @@ This shape would create create in the first 10 seconds 10 User of ``UserA``. In
 Reusing command line parameters in custom shapes
 ------------------------------------------------
 
-By default, using a custom shape will disable default run parameters (in both the CLI and the Web UI):
-- `--run-time` (providing this one with a custom shape will make locust to bail out)
+By default, using a custom shape will disregard default run parameters (in both the CLI and the Web UI):
+- `--run-time`
 - `--spawn-rate`
 - `--users`
 

{locust-2.26.1.dev12 → locust-2.26.1.dev26}/docs/extending-locust.rst

@@ -109,13 +109,7 @@ to the Flask app instance and use that to set up a new route::
         def my_added_page():
             return "Another page"
 
-You should now be able to start locust and browse to http://127.0.0.1:8089/added_page
-
-.. note::
-
-    Please note that at the moment Locust does not show the extended Web UI under the default root path `"/"`. 
-    To view your extensions, navigate to the newly added web route. In this example, `"/added_page"`.
-
+You should now be able to start locust and browse to http://127.0.0.1:8089/added_page. Note that it doesn't get automatically added as a new tab - you'll need to enter the URL directly.
 
 Extending Web UI
 ================
@@ -133,7 +127,7 @@ source code.
 
 *  ``extend_modern_web_ui.py``: Display a table with content-length for each call.
 
-* ``web_ui_cache_stats.py``: Display Varnish Hit/ Miss stats for each call. Could be easly extended to other CDN or cache proxies and gather other cache statistics such as cache age, control, ...
+* ``web_ui_cache_stats.py``: Display Varnish Hit/Miss stats for each call. This could easily be extended to other CDN or cache proxies and gather other cache statistics such as cache age, control, ...
 
  .. image:: images/extend_modern_web_ui_cache_stats.png
 

{locust-2.26.1.dev12 → locust-2.26.1.dev26}/docs/increase-performance.rst

@@ -17,7 +17,7 @@ In a *best case* scenario (doing small requests inside a ``while True``-loop) a
 
 The relative improvement may be even bigger with bigger request payloads, but it may also be smaller if your test is doing CPU intensive things not related to requests.
 
-Of course, in reality you should run :ref:`one locust process per CPU core <running-distributed>`.
+Of course, in reality, you should run :ref:`one locust process per CPU core <running-distributed>`.
 
 .. note::
 
@@ -83,7 +83,7 @@ FastHttpUser provides a ``rest`` method for testing REST/JSON HTTP interfaces. I
                 elif resp.js["bar"] != 42:
                     resp.failure(f"'bar' had an unexpected value: {resp.js['bar']}")
 
-For a complete example, see `rest.py <https://github.com/locustio/locust/blob/master/examples/rest.py>`_. That also shows how you can use inheritance to provide behaviours specific to your REST API that are common to multiple requests/testplans.
+For a complete example, see `rest.py <https://github.com/locustio/locust/blob/master/examples/rest.py>`_. That also shows how you can use inheritance to provide behaviors specific to your REST API that are common to multiple requests/testplans.
 
 .. note::
 
@@ -93,14 +93,14 @@ For a complete example, see `rest.py <https://github.com/locustio/locust/blob/ma
 Connection Handling
 ===================
 
-By default a user will reuse the same TCP/HTTP connection if possible. To more realistically simulate new users connecting to your application this connection can be manually closed.
+By default, a User will reuse the same TCP/HTTP connection (unless it breaks somehow). To more realistically simulate new browsers connecting to your application this connection can be manually closed.
 
 .. code-block:: python
 
         @task
         def t(self):
-            self.client.client.clientpool.close()
-            self.client.get("/") # Here a new connection will be created
+            self.client.client.clientpool.close() # self.client.client is not a typo
+            self.client.get("/")                  # Here a new connection will be created
 
 
 API

{locust-2.26.1.dev12 → locust-2.26.1.dev26}/docs/index.rst

@@ -33,7 +33,6 @@ Running your Locust tests
     running-distributed
     running-in-debugger
     running-in-docker
-    running-cloud-integration
     running-without-web-ui
 
 

{locust-2.26.1.dev12 → locust-2.26.1.dev26}/docs/quickstart.rst

@@ -16,9 +16,9 @@ A Locust test is essentially just a Python program making requests to the system
             self.client.get("/hello")
             self.client.get("/world")
 
-This user will make an HTTP request to ``/hello``, and after that to ``/world``, and then repeat. For a full explanation and a more realistic example see :ref:`writing-a-locustfile`.
+This user will make an HTTP request to ``/hello``, then to ``/world``, and then repeat. For a full explanation and a more realistic example see :ref:`writing-a-locustfile`.
 
-Change ``/hello`` and ``/world`` to some actual paths on the web site/service you want to test, put the code in a file named ``locustfile.py`` in your current directory and then run ``locust``:
+Change ``/hello`` and ``/world`` to some actual paths on the website/service you want to test, put the code in a file named ``locustfile.py`` in your current directory and then run ``locust``:
 
 .. code-block:: console
     :substitutions:
@@ -36,7 +36,7 @@ Open http://localhost:8089
 
 | Provide the host name of your server and try it out!
 
-The following screenshots show what it might look like when running this test using 50 concurrent users, with a ramp up rate of 1 users/s
+The following screenshots show what it might look like when running this test using 50 concurrent users, with a ramp up rate of 1 user/s
 
 .. image:: images/webui-running-statistics.png
 
@@ -56,11 +56,7 @@ The following screenshots show what it might look like when running this test us
 
     If your response times are *not* increasing then add even more users until you find the service's breaking point, or celebrate that your service is already performant enough for your expected load.
 
-    If you need some help digging into server side problems, or you're having trouble generating enough load to saturate your system, have a look at the `Locust FAQ  <https://github.com/locustio/locust/wiki/FAQ#increase-my-request-raterps>`_.
-
-.. note::
-
-    Things looking a little different? We've updated the UI! If for whatever reason you need to use the old version, you can always revert back to it using the ``--legacy-ui`` flag.
+    If you need some help digging into server side problems, or you're having trouble generating enough load to saturate your system, take a look at the `Locust FAQ  <https://github.com/locustio/locust/wiki/FAQ#increase-my-request-raterps>`_.
 
 Direct command line usage / headless
 ====================================

{locust-2.26.1.dev12 → locust-2.26.1.dev26}/docs/running-in-docker.rst

@@ -35,22 +35,7 @@ official Locust docker image as a base image::
     FROM locustio/locust
     RUN pip3 install some-python-package
 
-Running a distributed load test on Kubernetes
-==============================================
+Running Locust using Kubernetes
+===============================
 
-HELM
-*****
-
-One of the ways to run Locust on Kubernetes is to use a `Helm chart <https://helm.sh/>`_.
-
-There is a good helm chart here: `github.com/deliveryhero/helm-charts <https://github.com/deliveryhero/helm-charts/tree/master/stable/locust>`_.
-
-Note: this Helm chart is a separate project, and not supported by Locust maintainers. 
-
-Kubernetes Operator
-*******************
-Another way to run Locust on Kubernetes is to use the `Locust Kubernetes Operator <https://abdelrhmanhamouda.github.io/locust-k8s-operator/>`_.
-
-The Locust Operator is designed to unlock easy, seamless & effortless distributed performance testing in the cloud.
-
-Note: the Locust Kubernetes Operator is a separate project and is not supported by Locust maintainers. 
+See [Extensions](https://github.com/locustio/locust/wiki/Extensions#helm) in the wiki.

{locust-2.26.1.dev12 → locust-2.26.1.dev26}/docs/testing-other-systems.rst

@@ -10,9 +10,9 @@ Locust only comes with built-in support for HTTP/HTTPS but it can be extended to
 
     It is important that the protocol libraries you use can be `monkey-patched <https://www.gevent.org/intro.html#monkey-patching>`_ by gevent. 
     
-    Almost any libraries that are pure Python (using the Python ``socket`` module or some other standard library function like ``subprocess``) should work fine out of the box - but if they do their I/O calls in C, gevent will be unable to patch it. This will block the whole Locust/Python process (in practice limiting you to running a single User per worker process).
+    Almost any libraries that are pure Python (using the Python ``socket`` module or some other standard library function like ``subprocess``) should work fine out of the box - but if they do their I/O calls from compiled code C, gevent will be unable to patch it. This will block the whole Locust/Python process (in practice limiting you to running a single User per worker process).
 
-    Some C libraries allow for other workarounds. For example, if you want to use psycopg2 to performance test PostgreSQL, you can use `psycogreen <https://github.com/psycopg/psycogreen/>`_. If you are willing to get your hands dirty, you may also be able to patch a library yourself, but that is beyond the scope of this documentation.
+    Some C libraries allow for other workarounds. For example, if you want to use psycopg2 to performance test PostgreSQL, you can use `psycogreen <https://github.com/psycopg/psycogreen/>`_. If you are willing to get your hands dirty, you may be able to patch a library yourself, but that is beyond the scope of this documentation.
 
 XML-RPC
 =======

{locust-2.26.1.dev12 → locust-2.26.1.dev26}/docs/what-is-locust.rst

@@ -2,7 +2,7 @@
 What is Locust?
 ===============================
 
-Locust is an open source performance/load testing tool for HTTP and other protocols. Its developer friendly approach lets you to define your tests in regular Python code.
+Locust is an open source performance/load testing tool for HTTP and other protocols. Its developer friendly approach lets you define your tests in regular Python code.
 
 Locust tests can be run from command line or using its web-based UI. Throughput, response times and errors can be viewed in real time and/or exported for later analysis.
 
@@ -21,7 +21,7 @@ Features
     
 * **Write test scenarios in plain old Python**
 
- If you want your users to loop, perform some conditional behaviour or do some calculations, you just use the regular programming constructs provided by Python.
+ If you want your users to loop, perform some conditional behavior or do some calculations, you just use the regular programming constructs provided by Python.
  Locust runs every user inside its own greenlet (a lightweight process/coroutine). This enables you to write your tests like normal (blocking) Python code instead of having to use callbacks or some other mechanism.
  Because your scenarios are "just python" you can use your regular IDE, and version control your tests as regular code (as opposed to some other tools that use XML or binary formats)
 
@@ -37,7 +37,7 @@ Features
 
 * **Can test any system**
 
- Even though Locust primarily works with web sites/services, it can be used to test almost any system or protocol. Just :ref:`write a client <testing-other-systems>` 
+ Even though Locust primarily works with websites/services, it can be used to test almost any system or protocol. Just :ref:`write a client <testing-other-systems>` 
  for what you want to test, or `explore some created by the community <https://github.com/SvenskaSpel/locust-plugins#users>`_.
 
 * **Hackable**
@@ -47,12 +47,12 @@ Features
 Name & background
 =================
 
-Locust was born out of a frustration with existing solutions. No existing load testing tool was well equipped to generate realistic 
+Locust was born out of a frustration with existing solutions. No existing load testing tool was well-equipped to generate realistic 
 load against a dynamic website where most pages had different content for different users. Existing tools used clunky interfaces or 
 verbose configuration files to declare the tests. In Locust we took a different approach. Instead of configuration formats or UIs 
-you'd get a python framework that would let you define the behaviour of your users using Python code. 
+you'd get a python framework that would let you define the behavior of your users using Python code. 
 
-Locust takes its name from the `grasshopper species <https://en.wikipedia.org/wiki/Locust>`_, known for their swarming behaviour. 
+Locust takes its name from the `grasshopper species <https://en.wikipedia.org/wiki/Locust>`_, known for their swarming behavior. 
 
 :ref:`history`
 
@@ -62,7 +62,6 @@ Authors
 - Jonatan Heyman (`@heyman <https://github.com/heyman>`_)
 - Lars Holmberg (`@cyberw <https://github.com/cyberw>`_)
 - Andrew Baldwin (`@andrewbaldwin44 <https://github.com/andrewbaldwin44>`_)
-- Carl Byström, Joakim Hamrén & Hugo Heyman
 
 Many thanks to our other great `contributors <https://github.com/locustio/locust/graphs/contributors>`_!
 

{locust-2.26.1.dev12 → locust-2.26.1.dev26}/docs/writing-a-locustfile.rst

@@ -68,7 +68,7 @@ is executed. For more info see :ref:`wait-time`.
 Methods decorated with ``@task`` are the core of your locust file. For every running User,
 Locust creates a `greenlet <https://greenlet.readthedocs.io/en/stable/greenlet.html>`_ (a coroutine or "micro-thread"), that will call those methods. 
 Code within a task is executed sequentially (it is just regular Python code),
-so ``/world`` wont be called until the response from ``/hello`` has been received.
+so ``/world`` won't be called until the response from ``/hello`` has been received.
 
 .. code-block:: python
 
@@ -204,8 +204,8 @@ user classes to use from the same locustfile by passing them as command line arg
 
     $ locust -f locust_file.py WebUser MobileUser
 
-If you wish to simulate more users of a certain type you can set a weight attribute on those
-classes. Say for example, web users are three times more likely than mobile users:
+If you wish to simulate more users of a certain type than another you can set a weight attribute on those
+classes. The code below will make Locust spawn 3 times as many WebUsers as MobileUsers:
 
 .. code-block:: python
 
@@ -217,9 +217,9 @@ classes. Say for example, web users are three times more likely than mobile user
         weight = 1
         ...
 
-Also you can set the :py:attr:`fixed_count <locust.User.fixed_count>` attribute.
-In this case the weight attribute will be ignored and the exact count users will be spawned.
-These users are spawned first. In the example below, only one instance of AdminUser
+Also, you can set the :py:attr:`fixed_count <locust.User.fixed_count>` attribute.
+In this case, the weight attribute will be ignored and only that exact number users will be spawned.
+These users are spawned before any regular, weighted ones. In the example below, only one instance of AdminUser
 will be spawned, to make some specific work with more accurate control
 of request count independently of total user count.
 
@@ -249,7 +249,7 @@ tasks attribute
 ---------------
 
 A User class can have tasks declared as methods under it using the :py:func:`@task <locust.task>` decorator, but one can also
-specify tasks using the *tasks* attribute which is described in more details :ref:`below <tasks-attribute>`.
+specify tasks using the *tasks* attribute, which is described in more details :ref:`below <tasks-attribute>`.
 
 environment attribute
 ---------------------
@@ -281,12 +281,9 @@ Tasks
 =====
 
 When a load test is started, an instance of a User class will be created for each simulated user
-and they will start running within their own green thread. When these users run they pick tasks that
+and they will start running within their own greenlet. When these users run they pick tasks that
 they execute, sleep for awhile, and then pick a new task and so on.
 
-The tasks are normal python callables and - if we were load-testing an auction website - they could do
-stuff like "loading the start page", "searching for some product", "making a bid", etc.
-
 @task decorator
 ---------------
 
@@ -617,7 +614,7 @@ Using :ref:`catch_response <catch-response>` and accessing `request_meta <https:
 HTTP Proxy settings
 -------------------
 To improve performance, we configure requests to not look for HTTP proxy settings in the environment by setting
-requests.Session's trust_env attribute to ``False``. If you don't want this you can manually set
+requests.Session's trust_env attribute to ``False``. If you don't want this, you can manually set
 ``locust_instance.client.trust_env`` to ``True``. For further details, refer to the
 `documentation of requests <https://requests.readthedocs.io/en/master/api/#requests.Session.trust_env>`_.
 
@@ -644,7 +641,7 @@ For more configuration options, refer to the
 
 TaskSets
 ================================
-TaskSets is a way to structure tests of hierarchical web sites/systems. You can :ref:`read more about it here <tasksets>`.
+TaskSets is a way to structure tests of hierarchical websites/systems. You can :ref:`read more about it here <tasksets>`.
 
 Examples
 ========
@@ -660,7 +657,7 @@ in any Python program. The current working directory is automatically added to p
 so any python file/module/packages that resides in the working directory can be imported using the
 python ``import`` statement.
 
-For small tests, keeping all of the test code in a single ``locustfile.py`` should work fine, but for
+For small tests, keeping all the test code in a single ``locustfile.py`` should work fine, but for
 larger test suites, you'll probably want to split the code into multiple files and directories.
 
 How you structure the test source code is of course entirely up to you, but we recommend that you

{locust-2.26.1.dev12 → locust-2.26.1.dev26}/locust/_version.py

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

{locust-2.26.1.dev12 → locust-2.26.1.dev26}/locust/clients.py

@@ -113,8 +113,7 @@ class HttpSession(requests.Session):
         :param cookies: (optional) Dict or CookieJar object to send with the :class:`Request`.
         :param files: (optional) Dictionary of ``'filename': file-like-objects`` for multipart encoding upload.
         :param auth: (optional) Auth tuple or callable to enable Basic/Digest/Custom HTTP Auth.
-        :param timeout: (optional) How long in seconds to wait for the server to send data before giving up, as a float,
-            or a (`connect timeout, read timeout <user/advanced.html#timeouts>`_) tuple.
+        :param timeout: (optional) How long to wait for the server to send data before giving up, as a float, or a :ref:`(connect timeout, read timeout) <timeouts>` tuple.
         :type timeout: float or tuple
         :param allow_redirects: (optional) Set to True by default.
         :type allow_redirects: bool

{locust-2.26.1.dev12 → locust-2.26.1.dev26}/locust/main.py

@@ -126,7 +126,7 @@ def main():
 
             user_classes[key] = value
             available_user_classes[key] = value
-            available_user_tasks[key] = value.tasks or None
+            available_user_tasks[key] = value.tasks or {}
 
     if len(stats.PERCENTILES_TO_CHART) != 2:
         logging.error("stats.PERCENTILES_TO_CHART parameter should be 2 parameters \n")
@@ -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-2.26.1.dev12 → locust-2.26.1.dev26}/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-2.26.1.dev12 → locust-2.26.1.dev26}/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

{locust-2.26.1.dev12 → locust-2.26.1.dev26/locust.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: locust
-Version: 2.26.1.dev12
+Version: 2.26.1.dev26
 Summary: Developer friendly load testing framework
 License: MIT
 Project-URL: Homepage, https://github.com/locustio/locust
@@ -105,7 +105,7 @@ Locust's code base is intentionally kept small and doesn't solve everything out
 * [Send real time reporting data to TimescaleDB and visualize it in Grafana](https://github.com/SvenskaSpel/locust-plugins/blob/master/locust_plugins/dashboards/README.md)
 * [Wrap calls to handle the peculiarities of your REST API](https://github.com/SvenskaSpel/locust-plugins/blob/8af21862d8129a5c3b17559677fe92192e312d8f/examples/rest_ex.py#L87) 
 * [Use a totally custom load shape/profile](https://docs.locust.io/en/latest/custom-load-shape.html#custom-load-shape)
-* ...
+* [...](https://github.com/locustio/locust/wiki/Extensions)
 
 ## Links
 
@@ -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.dev12 → locust-2.26.1.dev26}/locust.egg-info/SOURCES.txt

@@ -45,7 +45,6 @@ docs/logging.rst
 docs/quickstart.rst
 docs/requirements.txt
 docs/retrieving-stats.rst
-docs/running-cloud-integration.rst
 docs/running-distributed.rst
 docs/running-in-debugger.rst
 docs/running-in-docker.rst

locust-2.26.1.dev12/docs/running-cloud-integration.rst

@@ -1,17 +0,0 @@
-.. _running-cloud-integration:
-
-=============================================
-Running Locust distributed with Terraform/AWS
-=============================================
-
-.. note::
-
-    This is broken at the moment. See https://github.com/locustio/locust/issues/2357 for a possible workaround.
-
-Here's one way to provision Locust using Infrastructure as Code/IaC.
-
-For this we use a `Terraform <https://www.terraform.io/>`_ module that provisions 1 leader and "n" worker nodes. This implementation uses AWS and EC2, but you may be able to modify it for other cloud providers.
-
-1. `Install terraform <https://learn.hashicorp.com/tutorials/terraform/install-cli?in=terraform/aws-get-started#install-terraform-on-linux>`_
-2. `Follow the README <https://github.com/locustio/locust/blob/master/examples/terraform/aws/README.md>`_
-3. Further reading: `Underlying Terraform module <https://registry.terraform.io/modules/marcosborges/loadtest-distribuited/aws/latest>`_