locust 2.22.1.dev67__py3-none-any.whl → 2.23.1__py3-none-any.whl

locust/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.22.1.dev67'
-__version_tuple__ = version_tuple = (2, 22, 1, 'dev67')
+__version__ = version = '2.23.1'
+__version_tuple__ = version_tuple = (2, 23, 1)

locust/argument_parser.py

@@ -4,17 +4,20 @@ import locust
 from locust import runners
 from locust.rpc import Message, zmqrpc
 
+import atexit
 import os
 import platform
 import socket
 import sys
+import tempfile
 import textwrap
 from typing import Any, NamedTuple
+from urllib.parse import urlparse
 from uuid import uuid4
 
 import configargparse
 import gevent
-from gevent.event import Event
+import requests
 
 version = locust.__version__
 
@@ -66,7 +69,7 @@ def _is_package(path):
     return os.path.isdir(path) and os.path.exists(os.path.join(path, "__init__.py"))
 
 
-def find_locustfile(locustfile):
+def find_locustfile(locustfile: str) -> str | None:
     """
     Attempt to locate a locustfile, either explicitly or by searching parent dirs.
     """
@@ -97,7 +100,8 @@ def find_locustfile(locustfile):
                 # we've reached the root path which has been checked this iteration
                 break
             path = parent_path
-    # Implicit 'return None' if nothing was found
+
+    return None
 
 
 def find_locustfiles(locustfiles: list[str], is_directory: bool) -> list[str]:
@@ -141,6 +145,37 @@ def find_locustfiles(locustfiles: list[str], is_directory: bool) -> list[str]:
     return file_paths
 
 
+def is_url(url: str) -> bool:
+    try:
+        result = urlparse(url)
+        if result.scheme == "https" or result.scheme == "http":
+            return True
+        else:
+            return False
+    except ValueError:
+        return False
+
+
+def download_locustfile_from_url(url: str) -> str:
+    try:
+        response = requests.get(url)
+    except requests.exceptions.RequestException as e:
+        sys.stderr.write(f"Failed to get locustfile from: {url}. Exception: {e}")
+        sys.exit(1)
+
+    with open(os.path.join(tempfile.gettempdir(), url.rsplit("/", 1)[-1]), "w") as locustfile:
+        locustfile.write(response.text)
+
+    def exit_handler():
+        try:
+            os.remove(locustfile.name)
+        except FileNotFoundError:
+            pass  # this is normal when multiple workers are running on the same machine
+
+    atexit.register(exit_handler)
+    return locustfile.name
+
+
 def get_empty_argument_parser(add_help=True, default_config_files=DEFAULT_CONFIG_FILES) -> LocustArgumentParser:
     parser = LocustArgumentParser(
         default_config_files=default_config_files,
@@ -214,11 +249,19 @@ def download_locustfile_from_master(master_host: str, master_port: int) -> str:
         sys.exit(1)
 
     filename = msg.data["filename"]
-    with open(filename, "w") as local_file:
-        local_file.write(msg.data["contents"])
+    with open(os.path.join(tempfile.gettempdir(), filename), "w") as locustfile:
+        locustfile.write(msg.data["contents"])
+
+    def exit_handler():
+        try:
+            os.remove(locustfile.name)
+        except FileNotFoundError:
+            pass  # this is normal when multiple workers are running on the same machine
+
+    atexit.register(exit_handler)
 
     tempclient.close()
-    return filename
+    return locustfile.name
 
 
 def parse_locustfile_option(args=None) -> list[str]:
@@ -279,7 +322,9 @@ def parse_locustfile_option(args=None) -> list[str]:
         return [filename]
 
     # Comma separated string to list
-    locustfile_as_list = [locustfile.strip() for locustfile in options.locustfile.split(",")]
+    locustfile_as_list = [
+        download_locustfile_from_url(f) if is_url(f.strip()) else f.strip() for f in options.locustfile.split(",")
+    ]
 
     # Checking if the locustfile is a single file, multiple files or a directory
     if locustfile_is_directory(locustfile_as_list):
@@ -298,8 +343,8 @@ def parse_locustfile_option(args=None) -> list[str]:
             locustfile = None
         else:
             # Is a single file
-            locustfile = find_locustfile(options.locustfile)
-            locustfiles = [locustfile]
+            locustfile = find_locustfile(locustfile_as_list[0])
+            locustfiles = []
 
             if not locustfile:
                 if options.help or options.version:
@@ -317,6 +362,8 @@ def parse_locustfile_option(args=None) -> list[str]:
                     f"Could not find '{user_friendly_locustfile_name}'. {note_about_file_endings}See --help for available options.\n"
                 )
                 sys.exit(1)
+            else:
+                locustfiles.append(locustfile)
 
     return locustfiles
 

locust/main.py

@@ -132,6 +132,10 @@ def main():
         logging.error("stats.PERCENTILES_TO_CHART parameter should be 2 parameters \n")
         sys.exit(1)
 
+    if len(stats.MODERN_UI_PERCENTILES_TO_CHART) > 6:
+        logging.error("stats.MODERN_UI_PERCENTILES_TO_CHART parameter should be a maximum of 6 parameters \n")
+        sys.exit(1)
+
     def is_valid_percentile(parameter):
         try:
             if 0 < float(parameter) < 1:

locust/runners.py

@@ -1064,7 +1064,7 @@ class MasterRunner(DistributedRunner):
                     self.send_message(
                         "locustfile",
                         client_id=client_id,
-                        data={"filename": filename, "contents": file_contents},
+                        data={"filename": os.path.basename(filename), "contents": file_contents},
                     )
                 continue
             elif msg.type == "client_stopped":

locust/test/test_load_locustfile.py

@@ -1,10 +1,12 @@
 from locust import main
-from locust.argument_parser import parse_options
+from locust.argument_parser import parse_locustfile_option, parse_options
 from locust.main import create_environment
 from locust.user import HttpUser, TaskSet, User
 from locust.util.load_locustfile import is_user_class
 
+import filecmp
 import os
+import pathlib
 import textwrap
 
 from .mock_locustfile import MOCK_LOCUSTFILE_CONTENT, mock_locustfile
@@ -209,3 +211,18 @@ class TestLoadLocustfile(LocustTestCase):
                 ]
             )
             self.assertEqual("my_locust_file.py", options.locustfile)
+
+    def test_locustfile_from_url(self):
+        locustfiles = parse_locustfile_option(
+            args=[
+                "-f",
+                "https://raw.githubusercontent.com/locustio/locust/master/examples/basic.py",
+            ]
+        )
+        self.assertEqual(len(locustfiles), 1)
+        self.assertTrue(
+            filecmp.cmp(
+                locustfiles[0],
+                f"{os.getcwd()}/examples/basic.py",
+            )
+        )

locust/test/test_main.py

@@ -1721,12 +1721,15 @@ class SecondUser(HttpUser):
                 text=True,
             )
             stdout = proc.communicate()[0]
-            proc_worker2.communicate()
-            proc_worker.communicate()
+            stdout_worker = proc_worker.communicate()[0]
+            stdout_worker2 = proc_worker2.communicate()[0]
 
             self.assertIn('All users spawned: {"User1": 1} (1 total users)', stdout)
             self.assertIn("Locustfile contents changed on disk after first worker requested locustfile", stdout)
             self.assertIn("Shutting down (exit code 0)", stdout)
+            self.assertNotIn("Traceback", stdout)
+            self.assertNotIn("Traceback", stdout_worker)
+            self.assertNotIn("Traceback", stdout_worker2)
 
             self.assertEqual(0, proc.returncode)
             self.assertEqual(0, proc_worker.returncode)