locust-cloud 1.27.2.dev6__tar.gz → 1.27.2.dev11__tar.gz

{locust_cloud-1.27.2.dev6 → locust_cloud-1.27.2.dev11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: locust-cloud
-Version: 1.27.2.dev6
+Version: 1.27.2.dev11
 Summary: Locust Cloud
 Project-URL: homepage, https://locust.cloud
 Project-URL: repository, https://github.com/locustcloud/locust-cloud

{locust_cloud-1.27.2.dev6 → locust_cloud-1.27.2.dev11}/locust_cloud/__init__.py

@@ -78,6 +78,7 @@ def main(locustfiles: list[str] | None = None):
             if env_variable.startswith("LOCUST_")
             and env_variable
             not in [
+                "LOCUST_LOCUSTFILE",
                 "LOCUST_USERS",
                 "LOCUST_WEB_HOST_DISPLAY_NAME",
                 "LOCUST_SKIP_MONKEY_PATCH",
@@ -86,7 +87,7 @@ def main(locustfiles: list[str] | None = None):
         ]
 
         locust_args = [
-            {"name": "LOCUST_USERS", "value": str(options.users)},
+            {"name": "LOCUST_LOCUSTFILE", "value": ",".join([str(file) for file in relative_locustfiles])},
             {"name": "LOCUST_FLAGS", "value": " ".join([option for option in locust_options if option != "--cloud"])},
             {"name": "LOCUSTCLOUD_DEPLOYER_URL", "value": session.api_url},
             *locust_env_variables,
@@ -98,7 +99,6 @@ def main(locustfiles: list[str] | None = None):
         payload = {
             "locust_args": locust_args,
             "project_data": project_data,
-            "user_count": options.users,
         }
 
         if options.image_tag is not None:
@@ -111,6 +111,10 @@ def main(locustfiles: list[str] | None = None):
         if options.workers is not None:
             payload["worker_count"] = options.workers
 
+        if options.users:
+            payload["user_count"] = options.users
+            locust_args.append({"name": "LOCUST_USERS", "value": str(options.users)})
+
         if options.requirements:
             payload["requirements"] = options.requirements
 

{locust_cloud-1.27.2.dev6 → locust_cloud-1.27.2.dev11}/locust_cloud/args.py

@@ -269,11 +269,15 @@ Parameters specified on command line override env vars, which in turn override c
     add_config_file_help=False,
     add_env_var_help=False,
 )
+# Consume locustfile flag to not be forwarded into load generators
+combined_cloud_parser.add_argument(
+    "-f",
+    "--locustfile",
+)
 combined_cloud_parser.add_argument(
     "-u",
     "--users",
     type=int,
-    default=1,
     help="Number of users to launch. This is the same as the regular Locust argument, but also affects how many workers to launch.",
     env_var="LOCUST_USERS",
 )