From 60b592705b17c8b66fff4a5fccd5a2b5de1ba1ac Mon Sep 17 00:00:00 2001 From: Lars Holmberg Date: Fri, 19 Jan 2024 08:24:47 +0100 Subject: [PATCH] dont crash if locust-plugins isnt installed --- locust_swarm/swarm.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/locust_swarm/swarm.py b/locust_swarm/swarm.py index a5baeb3..beff235 100644 --- a/locust_swarm/swarm.py +++ b/locust_swarm/swarm.py @@ -15,7 +15,6 @@ from datetime import datetime, timezone import psutil import configargparse -import locust_plugins import locust.util.timespan from locust_swarm._version import version @@ -251,11 +250,16 @@ def cleanup(server_list): def upload(server): files = [args.locustfile or "locustfile.py"] + args.extra_files if not args.skip_plugins: - files.append(os.path.dirname(locust_plugins.__file__)) try: - files.append(os.path.dirname(svs_locust.__file__)) - except NameError: - pass + import locust_plugins + + files.append(os.path.dirname(locust_plugins.__file__)) + try: + files.append(os.path.dirname(svs_locust.__file__)) + except NameError: + pass + except ImportError: + pass # locust-plugins wasnt installed if len(files) > 1: filestr = "{" + ",".join(files) + "}" else: