locust 2.27.1.dev12__tar.gz → 2.27.1.dev27__tar.gz

{locust-2.27.1.dev12 → locust-2.27.1.dev27}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: locust
-Version: 2.27.1.dev12
-Summary: Developer friendly load testing framework
+Version: 2.27.1.dev27
+Summary: Developer-friendly load testing framework
 License: MIT
 Project-URL: Homepage, https://github.com/locustio/locust
 Project-URL: Documentation, https://docs.locust.io/
@@ -32,7 +32,7 @@ Requires-Dist: Werkzeug>=2.0.0
 Requires-Dist: requests>=2.26.0
 Requires-Dist: msgpack>=1.0.0
 Requires-Dist: pyzmq>=25.0.0
-Requires-Dist: geventhttpclient==2.2.1
+Requires-Dist: geventhttpclient>=2.3.1
 Requires-Dist: ConfigArgParse>=1.5.5
 Requires-Dist: tomli>=1.1.0; python_version < "3.11"
 Requires-Dist: psutil>=5.9.1
@@ -49,7 +49,7 @@ Requires-Dist: pywin32; platform_system == "Windows"
 [![GitHub contributors](https://img.shields.io/github/contributors/locustio/locust.svg)](https://github.com/locustio/locust/graphs/contributors)
 [![Support Ukraine Badge](https://bit.ly/support-ukraine-now)](https://github.com/support-ukraine/support-ukraine)
 
-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.
 

{locust-2.27.1.dev12 → locust-2.27.1.dev27}/README.md

@@ -7,7 +7,7 @@
 [![GitHub contributors](https://img.shields.io/github/contributors/locustio/locust.svg)](https://github.com/locustio/locust/graphs/contributors)
 [![Support Ukraine Badge](https://bit.ly/support-ukraine-now)](https://github.com/support-ukraine/support-ukraine)
 
-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.
 

{locust-2.27.1.dev12 → locust-2.27.1.dev27}/docs/custom-load-shape.rst

@@ -98,26 +98,23 @@ This shape would create create in the first 10 seconds 10 User of ``UserA``. In
 
 .. _use-common-options:
 
-Reusing command line parameters in custom shapes
-------------------------------------------------
+Reusing common options in custom shapes
+---------------------------------------
 
-By default, using a custom shape will disregard default run parameters (in both the CLI and the Web UI):
-- `--run-time`
-- `--spawn-rate`
-- `--users`
-
-
-If you need one or all of those parameters, you can force locust to accept them by setting the `use_common_options` attribute to `True`:
+When using shapes, the the *Users*, *Spawn Rate* and *Run Time* options will be hidden from the UI, and if you specify them on command line Locust will log a warning. This is because those options dont directly apply to shapes, and specifying them might be a mistake.
 
+If you really want to combine a shape with these options, set the ``use_common_options`` attribute and access them from ``self.runner.environment.parsed_options``:
 
 .. code-block:: python
 
     class MyCustomShape(LoadTestShape):
-
         use_common_options = True
-
+        
         def tick(self):
-            expected_run_time = self.runner.environment.parsed_options.run_time
-            # Do something with this expected run time
-            ...
+            run_time = self.get_run_time()
+            if run_time < self.runner.environment.parsed_options.run_time:
+                # User count rounded to nearest hundred, just like in previous example
+                user_count = round(run_time, -2)
+                return (user_count, self.runner.environment.parsed_options.spawn_rate)
+                
             return None

{locust-2.27.1.dev12 → locust-2.27.1.dev27}/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 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.
 

{locust-2.27.1.dev12 → locust-2.27.1.dev27}/locust/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.27.1.dev12'
-__version_tuple__ = version_tuple = (2, 27, 1, 'dev12')
+__version__ = version = '2.27.1.dev27'
+__version_tuple__ = version_tuple = (2, 27, 1, 'dev27')

{locust-2.27.1.dev12 → locust-2.27.1.dev27}/locust/argument_parser.py

@@ -9,6 +9,7 @@ import atexit
 import os
 import platform
 import socket
+import ssl
 import sys
 import tempfile
 import textwrap
@@ -705,7 +706,7 @@ Typically ONLY these options (and --locustfile) need to be specified on workers,
         "-V",
         action="version",
         help="Show program's version number and exit",
-        version=f"locust {version} from {os.path.dirname(__file__)} (python {platform.python_version()})",
+        version=f"locust {version} from {os.path.dirname(__file__)} (Python {platform.python_version()}, {' '.join(ssl.OPENSSL_VERSION.split(' ')[0:2])})",
     )
     other_group.add_argument(
         "--exit-code-on-error",

{locust-2.27.1.dev12 → locust-2.27.1.dev27}/locust/html.py

@@ -10,7 +10,7 @@ from jinja2 import Environment, FileSystemLoader
 
 from . import stats as stats_module
 from .runners import STATE_STOPPED, STATE_STOPPING, MasterRunner
-from .stats import sort_stats
+from .stats import sort_stats, update_stats_history
 from .user.inspectuser import get_ratio
 
 PERCENTILES_FOR_HTML_REPORT = [0.50, 0.6, 0.7, 0.8, 0.9, 0.95, 0.99, 1.0]
@@ -54,6 +54,7 @@ def get_html_report(
         {**exc, "nodes": ", ".join(exc["nodes"])} for exc in environment.runner.exceptions.values()
     ]
 
+    update_stats_history(environment.runner)
     history = stats.history
 
     static_js = []

{locust-2.27.1.dev12 → locust-2.27.1.dev27}/locust/main.py

@@ -434,7 +434,9 @@ See https://github.com/locustio/locust/wiki/Installation#increasing-maximum-numb
         try:
             options.run_time = parse_timespan(options.run_time)
         except ValueError:
-            logger.error("Valid --run-time formats are: 20, 20s, 3m, 2h, 1h20m, 3h30m10s, etc.")
+            logger.error(
+                f"Invalid --run-time argument ({options.run_time}), accepted formats are for example 120, 120s, 2m, 3h, 3h30m10s."
+            )
             sys.exit(1)
 
     if options.csv_prefix:

{locust-2.27.1.dev12 → locust-2.27.1.dev27}/locust/stats.py

@@ -907,28 +907,32 @@ def sort_stats(stats: dict[Any, S]) -> list[S]:
     return [stats[key] for key in sorted(stats.keys())]
 
 
+def update_stats_history(runner: Runner) -> None:
+    stats = runner.stats
+    current_response_time_percentiles = {
+        f"response_time_percentile_{percentile}": stats.total.get_current_response_time_percentile(percentile) or 0
+        for percentile in PERCENTILES_TO_CHART
+    }
+
+    r = {
+        **current_response_time_percentiles,
+        "time": datetime.datetime.now(tz=datetime.timezone.utc).strftime("%H:%M:%S"),
+        "current_rps": stats.total.current_rps or 0,
+        "current_fail_per_sec": stats.total.current_fail_per_sec or 0,
+        "total_avg_response_time": stats.total.avg_response_time,
+        "user_count": runner.user_count or 0,
+    }
+    stats.history.append(r)
+
+
 def stats_history(runner: Runner) -> None:
     """Save current stats info to history for charts of report."""
     while True:
-        stats = runner.stats
-        if not stats.total.use_response_times_cache:
+        if not runner.stats.total.use_response_times_cache:
             break
         if runner.state != "stopped":
-            current_response_time_percentiles = {
-                f"response_time_percentile_{percentile}": stats.total.get_current_response_time_percentile(percentile)
-                or 0
-                for percentile in PERCENTILES_TO_CHART
-            }
-
-            r = {
-                **current_response_time_percentiles,
-                "time": datetime.datetime.now(tz=datetime.timezone.utc).strftime("%H:%M:%S"),
-                "current_rps": stats.total.current_rps or 0,
-                "current_fail_per_sec": stats.total.current_fail_per_sec or 0,
-                "total_avg_response_time": stats.total.avg_response_time,
-                "user_count": runner.user_count or 0,
-            }
-            stats.history.append(r)
+            update_stats_history(runner)
+
         gevent.sleep(HISTORY_STATS_INTERVAL_SEC)
 
 

{locust-2.27.1.dev12 → locust-2.27.1.dev27}/locust/web.py

@@ -211,11 +211,14 @@ class WebUI:
             for key, value in request.form.items():
                 if key == "user_count":  # if we just renamed this field to "users" we wouldn't need this
                     user_count = int(value)
+                    parsed_options_dict["users"] = user_count
                 elif key == "spawn_rate":
                     spawn_rate = float(value)
+                    parsed_options_dict[key] = spawn_rate
                 elif key == "host":
                     # Replace < > to guard against XSS
                     environment.host = str(request.form["host"]).replace("<", "").replace(">", "")
+                    parsed_options_dict[key] = environment.host
                 elif key == "user_classes":
                     # Set environment.parsed_options.user_classes to the selected user_classes
                     parsed_options_dict[key] = request.form.getlist("user_classes")
@@ -224,6 +227,7 @@ class WebUI:
                         continue
                     try:
                         run_time = parse_timespan(value)
+                        parsed_options_dict[key] = run_time
                     except ValueError:
                         err_msg = "Valid run_time formats are : 20, 20s, 3m, 2h, 1h20m, 3h30m10s, etc."
                         logger.error(err_msg)

{locust-2.27.1.dev12 → locust-2.27.1.dev27}/locust.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: locust
-Version: 2.27.1.dev12
-Summary: Developer friendly load testing framework
+Version: 2.27.1.dev27
+Summary: Developer-friendly load testing framework
 License: MIT
 Project-URL: Homepage, https://github.com/locustio/locust
 Project-URL: Documentation, https://docs.locust.io/
@@ -32,7 +32,7 @@ Requires-Dist: Werkzeug>=2.0.0
 Requires-Dist: requests>=2.26.0
 Requires-Dist: msgpack>=1.0.0
 Requires-Dist: pyzmq>=25.0.0
-Requires-Dist: geventhttpclient==2.2.1
+Requires-Dist: geventhttpclient>=2.3.1
 Requires-Dist: ConfigArgParse>=1.5.5
 Requires-Dist: tomli>=1.1.0; python_version < "3.11"
 Requires-Dist: psutil>=5.9.1
@@ -49,7 +49,7 @@ Requires-Dist: pywin32; platform_system == "Windows"
 [![GitHub contributors](https://img.shields.io/github/contributors/locustio/locust.svg)](https://github.com/locustio/locust/graphs/contributors)
 [![Support Ukraine Badge](https://bit.ly/support-ukraine-now)](https://github.com/support-ukraine/support-ukraine)
 
-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.
 

{locust-2.27.1.dev12 → locust-2.27.1.dev27}/locust.egg-info/SOURCES.txt

@@ -94,6 +94,11 @@ examples/custom_shape/step_load.py
 examples/custom_shape/wait_user_count.py
 examples/custom_xmlrpc_client/server.py
 examples/custom_xmlrpc_client/xmlrpc_locustfile.py
+examples/dispatch_test_scripts/locustfile.py
+examples/dispatch_test_scripts/run-disributed-headless.sh
+examples/dispatch_test_scripts/run-disributed-web.sh
+examples/dispatch_test_scripts/run-local-headless.sh
+examples/dispatch_test_scripts/run-local-web.sh
 examples/docker-compose/docker-compose.yml
 examples/grpc/grpc_user.py
 examples/grpc/hello.proto
@@ -312,9 +317,4 @@ locust/webui/src/utils/url.ts
 locust/webui/src/utils/tests/number.test.ts
 locust/webui/src/utils/tests/object.test.ts
 locust/webui/src/utils/tests/string.test.ts
-locust/webui/src/utils/tests/url.test.ts
-scripts/locustfile.py
-scripts/run-disributed-headless.sh
-scripts/run-disributed-web.sh
-scripts/run-local-headless.sh
-scripts/run-local-web.sh
+locust/webui/src/utils/tests/url.test.ts

{locust-2.27.1.dev12 → locust-2.27.1.dev27}/locust.egg-info/requires.txt

@@ -4,7 +4,7 @@ Werkzeug>=2.0.0
 requests>=2.26.0
 msgpack>=1.0.0
 pyzmq>=25.0.0
-geventhttpclient==2.2.1
+geventhttpclient>=2.3.1
 ConfigArgParse>=1.5.5
 psutil>=5.9.1
 Flask-Login>=0.6.3

{locust-2.27.1.dev12 → locust-2.27.1.dev27}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "locust"
 license = { text = "MIT" }
-description = "Developer friendly load testing framework"
+description = "Developer-friendly load testing framework"
 dynamic = ["version"]
 requires-python = ">=3.9"
 dependencies = [
@@ -15,7 +15,7 @@ dependencies = [
     "requests >=2.26.0",
     "msgpack >=1.0.0",
     "pyzmq >=25.0.0",
-    "geventhttpclient ==2.2.1",
+    "geventhttpclient >=2.3.1",
     "ConfigArgParse >=1.5.5",
     "tomli >=1.1.0; python_version<'3.11'",
     "psutil >=5.9.1",