locust 2.25.1.dev17__tar.gz → 2.26.1.dev7__tar.gz

{locust-2.25.1.dev17 → locust-2.26.1.dev7}/.github/workflows/tests.yml

@@ -151,7 +151,7 @@ jobs:
           python -m build
           echo "TAG=${GITHUB_REF#refs/*/}" | tee -a $GITHUB_ENV
       - name: Publish tagged version to PyPI
-        uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}
@@ -190,7 +190,7 @@ jobs:
           python -m build
       - name: Publish prerelease version to PyPI
         if: ${{ env.NOT_MERGE_COMMIT == '' }}
-        uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}

{locust-2.25.1.dev17 → locust-2.26.1.dev7}/.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.3.7
+    rev: v0.3.7  # Pin the same version in the tox.ini file.
     hooks:
       # Run the linter.
       - id: ruff

{locust-2.25.1.dev17 → locust-2.26.1.dev7}/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Detailed changelog
 The most important changes can also be found in [the documentation](https://docs.locust.io/en/latest/changelog.html).
 
+## [2.26.0](https://github.com/locustio/locust/tree/2.26.0) (2024-04-18)
+
+[Full Changelog](https://github.com/locustio/locust/compare/2.25.0...2.26.0)
+
+**Merged pull requests:**
+
+- Reformat and lint stuff. And pin gevenhttpclient version [\#2682](https://github.com/locustio/locust/pull/2682) ([cyberw](https://github.com/cyberw))
+- Add ruff pre commit hook [\#2680](https://github.com/locustio/locust/pull/2680) ([cyberw](https://github.com/cyberw))
+- Remove python 3.8 compatibility code [\#2679](https://github.com/locustio/locust/pull/2679) ([cyberw](https://github.com/cyberw))
+- Drop support for Python 3.8 [\#2677](https://github.com/locustio/locust/pull/2677) ([cyberw](https://github.com/cyberw))
+- Update geventhttpclient and adjust FastHttpUser max\_retries / max\_redirects [\#2676](https://github.com/locustio/locust/pull/2676) ([cyberw](https://github.com/cyberw))
+
 ## [2.25.0](https://github.com/locustio/locust/tree/2.25.0) (2024-04-14)
 
 [Full Changelog](https://github.com/locustio/locust/compare/2.24.1...2.25.0)

{locust-2.25.1.dev17/locust.egg-info → locust-2.26.1.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: locust
-Version: 2.25.1.dev17
+Version: 2.26.1.dev7
 Summary: Developer friendly load testing framework
 License: MIT
 Project-URL: Homepage, https://github.com/locustio/locust
@@ -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.2.1
 Requires-Dist: ConfigArgParse>=1.5.5
 Requires-Dist: tomli>=1.1.0; python_version < "3.11"
 Requires-Dist: psutil>=5.9.1
@@ -44,7 +44,7 @@ Requires-Dist: pywin32; platform_system == "Windows"
 # Locust
 
 [![PyPI](https://img.shields.io/pypi/v/locust.svg)](https://pypi.org/project/locust/)
-![Python Version from PEP 621 TOML](https://img.shields.io/python/required-version-toml?tomlFilePath=https%3A%2F%2Fraw.githubusercontent.com%2Flocustio%2Flocust%2Fmaster%2Fpyproject.toml&link=https%3A%2F%2Fpypi.org%2Fproject%2Flocust)
+![Python Version from PEP 621 TOML](https://img.shields.io/python/required-version-toml?tomlFilePath=https%3A%2F%2Fraw.githubusercontent.com%2Flocustio%2Flocust%2Fmaster%2Fpyproject.toml)
 [![Downloads](https://pepy.tech/badge/locust/week)](https://pepy.tech/project/locust)
 [![Build Status](https://github.com/locustio/locust/workflows/Tests/badge.svg)](https://github.com/locustio/locust/actions?query=workflow%3ATests)
 [![GitHub contributors](https://img.shields.io/github/contributors/locustio/locust.svg)](https://github.com/locustio/locust/graphs/contributors)

{locust-2.25.1.dev17 → locust-2.26.1.dev7}/README.md

@@ -1,7 +1,7 @@
 # Locust
 
 [![PyPI](https://img.shields.io/pypi/v/locust.svg)](https://pypi.org/project/locust/)
-![Python Version from PEP 621 TOML](https://img.shields.io/python/required-version-toml?tomlFilePath=https%3A%2F%2Fraw.githubusercontent.com%2Flocustio%2Flocust%2Fmaster%2Fpyproject.toml&link=https%3A%2F%2Fpypi.org%2Fproject%2Flocust)
+![Python Version from PEP 621 TOML](https://img.shields.io/python/required-version-toml?tomlFilePath=https%3A%2F%2Fraw.githubusercontent.com%2Flocustio%2Flocust%2Fmaster%2Fpyproject.toml)
 [![Downloads](https://pepy.tech/badge/locust/week)](https://pepy.tech/project/locust)
 [![Build Status](https://github.com/locustio/locust/workflows/Tests/badge.svg)](https://github.com/locustio/locust/actions?query=workflow%3ATests)
 [![GitHub contributors](https://img.shields.io/github/contributors/locustio/locust.svg)](https://github.com/locustio/locust/graphs/contributors)

{locust-2.25.1.dev17 → locust-2.26.1.dev7}/benchmarks/dispatch.py

@@ -566,19 +566,19 @@ if __name__ == "__main__":
             all_dispatched_users_ramp_down = list(users_dispatcher)
             dispatch_iteration_durations_ramp_down = users_dispatcher.dispatch_iteration_durations[:]
 
-            cpu_ramp_up = "{:3.3f}/{:3.3f}/{:3.3f}".format(
+            cpu_ramp_up = "{:3.3f}/{:3.3f}/{:3.3f}".format(  # noqa: UP032
                 1000 * statistics.mean(dispatch_iteration_durations_ramp_up),
                 1000 * min(dispatch_iteration_durations_ramp_up),
                 1000 * max(dispatch_iteration_durations_ramp_up),
-            )
-            cpu_ramp_down = "{:3.3f}/{:3.3f}/{:3.3f}".format(
+            )  # noqa: UP032
+            cpu_ramp_down = "{:3.3f}/{:3.3f}/{:3.3f}".format(  # noqa: UP032
                 1000 * statistics.mean(dispatch_iteration_durations_ramp_down),
                 1000 * min(dispatch_iteration_durations_ramp_down),
                 1000 * max(dispatch_iteration_durations_ramp_down),
             )
 
             print(
-                "{:04.0f}/{:04.0f} - {:,} workers - {:,} users - {} user classes - {:,} users/s - instantiate: {:.3f}ms - new_dispatch (ramp-up/ramp-down): {:.3f}ms/{:.3f}ms - cpu_ramp_up: {}ms - cpu_ramp_down: {}ms".format(
+                "{:04.0f}/{:04.0f} - {:,} workers - {:,} users - {} user classes - {:,} users/s - instantiate: {:.3f}ms - new_dispatch (ramp-up/ramp-down): {:.3f}ms/{:.3f}ms - cpu_ramp_up: {}ms - cpu_ramp_down: {}ms".format(  # noqa: UP032
                     case_index + 1,
                     case_count,
                     worker_count,

{locust-2.25.1.dev17 → locust-2.26.1.dev7}/docs/changelog.rst

@@ -4,6 +4,12 @@ Changelog Highlights
 
 For full details of the Locust changelog, please see https://github.com/locustio/locust/blob/master/CHANGELOG.md
 
+2.26.0
+======
+* Drop support for Python 3.8
+* Update geventhttpclient and adjust FastHttpUser max_retries / max_redirects (https://github.com/locustio/locust/pull/2676)
+* Pin gevenhttpclient version (https://github.com/locustio/locust/pull/2682)
+
 2.25.0
 ======
 * Add functionality to run listener functions for `custom_messages` concurrently (https://github.com/locustio/locust/pull/2650)

{locust-2.25.1.dev17 → locust-2.26.1.dev7}/docs/developing-locust.rst

@@ -20,7 +20,7 @@ Now the ``locust`` command will run *your* code with no need for reinstalling af
 
 To contribute your changes, push to a branch in your repo and then `open a PR on github <https://github.com/locustio/locust/compare>`_. 
 
-If you install `pre-commit <https://pre-commit.com/>`_ linting and format checks/fixes will be automatically performed saving you a round trip to GitHub actions.
+If you install `pre-commit <https://pre-commit.com/>`_, linting and format checks/fixes will be automatically performed before each commit.
 
 Before you open a pull request, make sure all the tests work. And if you are adding a feature, make sure it is documented (in ``docs/*.rst``).
 
@@ -34,10 +34,10 @@ We use `tox <https://tox.readthedocs.io/en/stable/>`_ to automate tests across m
     $ pip3 install tox
     $ tox
     ...
-    py38: install_deps> python -I -m pip install cryptography mock pyquery retry
-    py38: commands[0]> python3 -m pip install .
+    py39: install_deps> python -I -m pip install cryptography mock pyquery retry
+    py39: commands[0]> python3 -m pip install .
     ...
-    py38: commands[1]> python3 -m unittest discover
+    py39: commands[1]> python3 -m unittest discover
     ...
 
 To only run a specific suite or specific test you can call `pytest <https://docs.pytest.org/>`_ directly:

{locust-2.25.1.dev17 → locust-2.26.1.dev7}/locust/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.25.1.dev17'
-__version_tuple__ = version_tuple = (2, 25, 1, 'dev17')
+__version__ = version = '2.26.1.dev7'
+__version_tuple__ = version_tuple = (2, 26, 1, 'dev7')

{locust-2.25.1.dev17 → locust-2.26.1.dev7}/locust/argument_parser.py

@@ -666,7 +666,7 @@ Typically ONLY these options (and --locustfile) need to be specified on workers,
         nargs="*",
         metavar="<tag>",
         env_var="LOCUST_TAGS",
-        help="List of tags to include in the test, so only tasks with any matching tags will be executed",
+        help="List of tags to include in the test, so only tasks with at least one matching tag will be executed",
     )
     tag_group.add_argument(
         "-E",

{locust-2.25.1.dev17 → locust-2.26.1.dev7}/locust/dispatch.py

@@ -100,8 +100,7 @@ class UsersDispatcher(Iterator):
         self._no_user_to_spawn = False
 
     def get_current_user_count(self) -> int:
-        # need to ignore type due to https://github.com/python/mypy/issues/1507
-        return sum(map(sum, map(dict.values, self._users_on_workers.values())))  # type: ignore
+        return sum(map(sum, map(dict.values, self._users_on_workers.values())))
 
     @property
     def dispatch_in_progress(self):
@@ -449,5 +448,4 @@ class UsersDispatcher(Iterator):
         The implementation was profiled and compared to other implementations such as dict-comprehensions
         and the one below is the most efficient.
         """
-        # type is ignored due to: https://github.com/python/mypy/issues/1507
-        return dict(zip(users_on_workers.keys(), map(dict.copy, users_on_workers.values())))  # type: ignore
+        return dict(zip(users_on_workers.keys(), map(dict.copy, users_on_workers.values())))

{locust-2.25.1.dev17 → locust-2.26.1.dev7}/locust/rpc/protocol.py

@@ -5,7 +5,7 @@ import datetime
 import msgpack
 
 try:
-    from bson import ObjectId  # type: ignore
+    from bson import ObjectId
 except ImportError:
 
     class ObjectId:  # type: ignore

{locust-2.25.1.dev17 → locust-2.26.1.dev7}/locust/runners.py

@@ -345,10 +345,10 @@ class Runner:
                 return
             elif self.shape_last_tick != current_tick:
                 if len(current_tick) == 2:
-                    user_count, spawn_rate = current_tick  # type: ignore
+                    user_count, spawn_rate = current_tick
                     user_classes = None
                 else:
-                    user_count, spawn_rate, user_classes = current_tick  # type: ignore
+                    user_count, spawn_rate, user_classes = current_tick
                 logger.info("Shape test updating to %d users at %.2f spawn rate" % (user_count, spawn_rate))
                 # TODO: This `self.start()` call is blocking until the ramp-up is completed. This can leads
                 #       to unexpected behaviours such as the one in the following example:
@@ -1453,7 +1453,7 @@ class WorkerRunner(DistributedRunner):
 
 
 def _format_user_classes_count_for_log(user_classes_count: dict[str, int]) -> str:
-    return "{} ({} total users)".format(
+    return "{} ({} total users)".format(  # noqa: UP032
         json.dumps(dict(sorted(user_classes_count.items(), key=itemgetter(0)))),
         sum(user_classes_count.values()),
     )

{locust-2.25.1.dev17 → locust-2.26.1.dev7}/locust/test/mock_locustfile.py

@@ -1,10 +1,8 @@
 import os
 import random
 import time
-
 from contextlib import contextmanager
 
-
 MOCK_LOCUSTFILE_CONTENT = '''
 """This is a mock locust file for unit testing"""
 

{locust-2.25.1.dev17 → locust-2.26.1.dev7}/locust/test/mock_logging.py

@@ -1,9 +1,8 @@
 from __future__ import annotations
 
 import logging
-
-from typing import List, Union, Dict
 from types import TracebackType
+from typing import Union
 
 LogMessage = list[Union[str, dict[str, TracebackType]]]
 

{locust-2.25.1.dev17 → locust-2.26.1.dev7}/locust/test/test_dispatch.py

@@ -2167,9 +2167,7 @@ class TestLargeScale(unittest.TestCase):
                     dispatch_iteration_duration <= tol
                     for dispatch_iteration_duration in users_dispatcher.dispatch_iteration_durations
                 ),
-                "One or more dispatch took more than {:.0f}s to compute (max = {}ms)".format(
-                    tol * 1000, 1000 * max(users_dispatcher.dispatch_iteration_durations)
-                ),
+                f"One or more dispatch took more than {tol * 1000:.0f}s to compute (max = {1000 * max(users_dispatcher.dispatch_iteration_durations)}ms)",
             )
 
             self.assertEqual(_user_count(all_dispatched_users[-1]), target_user_count)
@@ -2181,9 +2179,7 @@ class TestLargeScale(unittest.TestCase):
                 self.assertLessEqual(
                     max(user_count_on_workers) - min(user_count_on_workers),
                     1,
-                    "One or more workers have too much users compared to the other workers when user count is {}".format(
-                        _user_count(dispatch_users)
-                    ),
+                    f"One or more workers have too much users compared to the other workers when user count is {_user_count(dispatch_users)}",
                 )
 
             for i, dispatch_users in enumerate(all_dispatched_users):
@@ -2202,9 +2198,7 @@ class TestLargeScale(unittest.TestCase):
                     self.assertLessEqual(
                         error_percent,
                         tol,
-                        "Distribution for user class {} is off by more than {}% when user count is {}".format(
-                            user_class, tol, _user_count(dispatch_users)
-                        ),
+                        f"Distribution for user class {user_class} is off by more than {tol}% when user count is {_user_count(dispatch_users)}",
                     )
 
     def test_ramp_down_from_100_000_to_0_users_with_50_user_classes_and_1000_workers_and_5000_spawn_rate(self):
@@ -2236,9 +2230,7 @@ class TestLargeScale(unittest.TestCase):
                     dispatch_iteration_duration <= tol
                     for dispatch_iteration_duration in users_dispatcher.dispatch_iteration_durations
                 ),
-                "One or more dispatch took more than {:.0f}ms to compute (max = {}ms)".format(
-                    tol * 1000, 1000 * max(users_dispatcher.dispatch_iteration_durations)
-                ),
+                f"One or more dispatch took more than {tol * 1000:.0f}ms to compute (max = {1000 * max(users_dispatcher.dispatch_iteration_durations)}ms)",
             )
 
             self.assertEqual(_user_count(all_dispatched_users[-1]), 0)
@@ -2250,9 +2242,7 @@ class TestLargeScale(unittest.TestCase):
                 self.assertLessEqual(
                     max(user_count_on_workers) - min(user_count_on_workers),
                     1,
-                    "One or more workers have too much users compared to the other workers when user count is {}".format(
-                        _user_count(dispatch_users)
-                    ),
+                    f"One or more workers have too much users compared to the other workers when user count is {_user_count(dispatch_users)}",
                 )
 
             for dispatch_users in all_dispatched_users[:-1]:
@@ -2267,9 +2257,7 @@ class TestLargeScale(unittest.TestCase):
                     self.assertLessEqual(
                         error_percent,
                         tol,
-                        "Distribution for user class {} is off by more than {}% when user count is {}".format(
-                            user_class, tol, _user_count(dispatch_users)
-                        ),
+                        f"Distribution for user class {user_class} is off by more than {tol}% when user count is {_user_count(dispatch_users)}",
                     )
 
 
@@ -3448,9 +3436,7 @@ class TestRampUpUsersFromZeroWithFixed(unittest.TestCase):
             self.target_user_count = target_user_count
 
         def __str__(self):
-            return "<RampUpCase fixed_counts={} weights={} target_user_count={}>".format(
-                self.fixed_counts, self.weights, self.target_user_count
-            )
+            return f"<RampUpCase fixed_counts={self.fixed_counts} weights={self.weights} target_user_count={self.target_user_count}>"
 
     def case_handler(self, cases: list[RampUpCase], expected: list[dict[str, int]], user_classes: list[type[User]]):
         self.assertEqual(len(cases), len(expected))
@@ -3734,8 +3720,6 @@ class TestRampUpDifferentUsers(unittest.TestCase):
 
         worker_node1 = WorkerNode("1")
 
-        sleep_time = 0.2
-
         user_dispatcher = UsersDispatcher(worker_nodes=[worker_node1], user_classes=[User1, User2, User3])
 
         user_dispatcher.new_dispatch(target_user_count=3, spawn_rate=3)
@@ -3761,8 +3745,6 @@ class TestRampUpDifferentUsers(unittest.TestCase):
 
         worker_node1 = WorkerNode("1")
 
-        sleep_time = 0.2
-
         user_dispatcher = UsersDispatcher(worker_nodes=[worker_node1], user_classes=[User1, User2, User3])
 
         user_dispatcher.new_dispatch(target_user_count=10, spawn_rate=10, user_classes=[User2])
@@ -3780,8 +3762,6 @@ class TestRampUpDifferentUsers(unittest.TestCase):
 
         worker_node1 = WorkerNode("1")
 
-        sleep_time = 0.2
-
         user_dispatcher = UsersDispatcher(worker_nodes=[worker_node1], user_classes=[User1, User2, User3])
 
         user_dispatcher.new_dispatch(target_user_count=10, spawn_rate=10, user_classes=[User2])
@@ -3802,8 +3782,6 @@ class TestRampUpDifferentUsers(unittest.TestCase):
 
         worker_node1 = WorkerNode("1")
 
-        sleep_time = 0.2
-
         user_dispatcher = UsersDispatcher(worker_nodes=[worker_node1], user_classes=[User1, User2, User3])
 
         user_dispatcher.new_dispatch(target_user_count=10, spawn_rate=10, user_classes=[User2])
@@ -3826,8 +3804,6 @@ class TestRampUpDifferentUsers(unittest.TestCase):
         worker_node2 = WorkerNode("2")
         worker_node3 = WorkerNode("3")
 
-        sleep_time = 0.2
-
         user_dispatcher = UsersDispatcher(
             worker_nodes=[worker_node1, worker_node2, worker_node3], user_classes=[User1, User2, User3]
         )
@@ -3886,8 +3862,6 @@ class TestRampUpDifferentUsers(unittest.TestCase):
         worker_node2 = WorkerNode("2")
         worker_node3 = WorkerNode("3")
 
-        sleep_time = 0.2
-
         user_dispatcher = UsersDispatcher(
             worker_nodes=[worker_node1, worker_node2, worker_node3], user_classes=[User1, User2, User3]
         )
@@ -4155,7 +4129,7 @@ def _aggregate_dispatched_users(d: dict[str, dict[str, int]]) -> dict[str, int]:
 
 
 def _user_count(d: dict[str, dict[str, int]]) -> int:
-    return sum(map(sum, map(dict.values, d.values())))  # type: ignore
+    return sum(map(sum, map(dict.values, d.values())))
 
 
 def _user_count_on_worker(d: dict[str, dict[str, int]], worker_node_id: str) -> int:

{locust-2.25.1.dev17 → locust-2.26.1.dev7}/locust/test/test_env.py

@@ -36,7 +36,7 @@ class TestEnvironment(LocustTestCase):
 
     def test_user_classes_with_same_name_is_error(self):
         with self.assertRaises(ValueError) as e:
-            environment = Environment(user_classes=[MyUserWithSameName1, MyUserWithSameName2])
+            Environment(user_classes=[MyUserWithSameName1, MyUserWithSameName2])
 
         self.assertEqual(
             e.exception.args[0],
@@ -186,7 +186,7 @@ class TestEnvironment(LocustTestCase):
                 pass
 
         with self.assertRaises(ValueError) as e:
-            environment = Environment(user_classes=[MyUser1, MyUser2])
+            Environment(user_classes=[MyUser1, MyUser2])
 
         self.assertEqual(
             e.exception.args[0],
@@ -269,7 +269,7 @@ class TestEnvironment(LocustTestCase):
             available_user_classes={"User1": MyUser1, "User2": MyUser2},
             available_user_tasks={"User1": MyUser1.tasks, "User2": MyUser2.tasks},
         )
-        worker = worker_env.create_worker_runner("127.0.0.1", master.server.port)
+        worker_env.create_worker_runner("127.0.0.1", master.server.port)
 
         master_env.update_user_class({"user_class_name": "User1", "host": "http://localhost", "tasks": ["my_task_2"]})
 

{locust-2.25.1.dev17 → locust-2.26.1.dev7}/locust/test/test_fasthttp.py

@@ -96,7 +96,7 @@ class TestFastHttpSession(WebserverTestCase):
     def test_slow_redirect(self):
         s = self.get_client()
         url = "/redirect?url=/redirect&delay=0.5"
-        r = s.get(url)
+        s.get(url)
         stats = self.runner.stats.get(url, method="GET")
         self.assertEqual(1, stats.num_requests)
         self.assertGreater(stats.avg_response_time, 500)
@@ -187,7 +187,7 @@ class TestFastHttpSession(WebserverTestCase):
             with s.get("/fail", catch_response=True) as r:
                 r.success()
                 raise OtherException("wtf")
-        except OtherException as e:
+        except OtherException:
             pass
         else:
             self.fail("OtherException should have been raised")
@@ -197,14 +197,14 @@ class TestFastHttpSession(WebserverTestCase):
 
     def test_catch_response_default_success(self):
         s = self.get_client()
-        with s.get("/ultra_fast", catch_response=True) as r:
+        with s.get("/ultra_fast", catch_response=True):
             pass
         self.assertEqual(1, self.environment.stats.get("/ultra_fast", "GET").num_requests)
         self.assertEqual(0, self.environment.stats.get("/ultra_fast", "GET").num_failures)
 
     def test_catch_response_default_fail(self):
         s = self.get_client()
-        with s.get("/fail", catch_response=True) as r:
+        with s.get("/fail", catch_response=True):
             pass
         self.assertEqual(1, self.environment.stats.total.num_requests)
         self.assertEqual(1, self.environment.stats.total.num_failures)
@@ -301,7 +301,7 @@ class TestRequestStatsWithWebserver(WebserverTestCase):
 
         l = MyUser(self.environment)
         path = "/no_content_length"
-        r = l.client.get(path)
+        l.client.get(path)
         self.assertEqual(
             self.runner.stats.get(path, "GET").avg_content_length,
             len("This response does not have content-length in the header"),
@@ -313,7 +313,7 @@ class TestRequestStatsWithWebserver(WebserverTestCase):
 
         l = MyUser(self.environment)
         path = "/no_content_length"
-        r = l.client.get(path, stream=True)
+        l.client.get(path, stream=True)
         self.assertEqual(0, self.runner.stats.get(path, "GET").avg_content_length)
 
     def test_request_stats_named_endpoint(self):
@@ -526,7 +526,7 @@ class TestFastHttpUserClass(WebserverTestCase):
     def test_slow_redirect(self):
         s = FastHttpSession(self.environment, "http://127.0.0.1:%i" % self.port, user=None)
         url = "/redirect?url=/redirect&delay=0.5"
-        r = s.get(url)
+        s.get(url)
         stats = self.runner.stats.get(url, method="GET")
         self.assertEqual(1, stats.num_requests)
         self.assertGreater(stats.avg_response_time, 500)
@@ -650,7 +650,7 @@ class TestFastHttpCatchResponse(WebserverTestCase):
         self.assertEqual(1, self.num_success)
 
     def test_catch_response_http_fail(self):
-        with self.user.client.get("/fail", catch_response=True) as response:
+        with self.user.client.get("/fail", catch_response=True):
             pass
         self.assertEqual(1, self.num_failures)
         self.assertEqual(0, self.num_success)
@@ -683,7 +683,7 @@ class TestFastHttpCatchResponse(WebserverTestCase):
         class MyTaskSet(TaskSet):
             @task
             def interrupted_task(self):
-                with self.client.get("/ultra_fast", catch_response=True) as r:
+                with self.client.get("/ultra_fast", catch_response=True):
                     raise InterruptTaskSet()
 
         class MyUser(FastHttpUser):

{locust-2.25.1.dev17 → locust-2.26.1.dev7}/locust/test/test_http.py

@@ -65,7 +65,7 @@ class TestHttpSession(WebserverTestCase):
     def test_slow_redirect(self):
         s = self.get_client()
         url = "/redirect?url=/redirect&delay=0.5"
-        r = s.get(url)
+        s.get(url)
         stats = self.runner.stats.get(url, method="GET")
         self.assertEqual(1, stats.num_requests)
         self.assertGreater(stats.avg_response_time, 500)
@@ -217,7 +217,7 @@ class TestHttpSession(WebserverTestCase):
             with s.get("/fail", catch_response=True) as r:
                 r.success()
                 raise OtherException("wtf")
-        except OtherException as e:
+        except OtherException:
             pass
         else:
             self.fail("OtherException should have been raised")
@@ -228,9 +228,9 @@ class TestHttpSession(WebserverTestCase):
     def test_catch_response_response_error(self):
         s = self.get_client()
         try:
-            with s.get("/fail", catch_response=True) as r:
+            with s.get("/fail", catch_response=True):
                 raise ResponseError("response error")
-        except ResponseError as e:
+        except ResponseError:
             self.fail("ResponseError should not have been raised")
 
         self.assertEqual(1, self.environment.stats.total.num_requests)
@@ -238,14 +238,14 @@ class TestHttpSession(WebserverTestCase):
 
     def test_catch_response_default_success(self):
         s = self.get_client()
-        with s.get("/ultra_fast", catch_response=True) as r:
+        with s.get("/ultra_fast", catch_response=True):
             pass
         self.assertEqual(1, self.environment.stats.get("/ultra_fast", "GET").num_requests)
         self.assertEqual(0, self.environment.stats.get("/ultra_fast", "GET").num_failures)
 
     def test_catch_response_default_fail(self):
         s = self.get_client()
-        with s.get("/fail", catch_response=True) as r:
+        with s.get("/fail", catch_response=True):
             pass
         self.assertEqual(1, self.environment.stats.total.num_requests)
         self.assertEqual(1, self.environment.stats.total.num_failures)
@@ -260,7 +260,7 @@ class TestHttpSession(WebserverTestCase):
 
         self.environment.events.request.add_listener(on_request)
 
-        with s.get("/wrong_url/01", name="replaced_url_name") as r:
+        with s.get("/wrong_url/01", name="replaced_url_name"):
             pass
 
         self.assertIn("for url: replaced_url_name", str(kwargs["exception"]))

{locust-2.25.1.dev17 → locust-2.26.1.dev7}/locust/test/test_locust_class.py

@@ -748,19 +748,19 @@ class TestCatchResponse(WebserverTestCase):
         self.assertEqual(1, self.num_failures)
         self.assertEqual(0, self.num_success)
 
-        with self.locust.client.get("/ultra_fast", catch_response=True) as response:
+        with self.locust.client.get("/ultra_fast", catch_response=True):
             pass
         self.assertEqual(1, self.num_failures)
         self.assertEqual(1, self.num_success)
 
-        with self.locust.client.get("/ultra_fast", catch_response=True) as response:
+        with self.locust.client.get("/ultra_fast", catch_response=True):
             raise ResponseError("Not working")
 
         self.assertEqual(2, self.num_failures)
         self.assertEqual(1, self.num_success)
 
     def test_catch_response_http_fail(self):
-        with self.locust.client.get("/fail", catch_response=True) as response:
+        with self.locust.client.get("/fail", catch_response=True):
             pass
         self.assertEqual(1, self.num_failures)
         self.assertEqual(0, self.num_success)
@@ -793,7 +793,7 @@ class TestCatchResponse(WebserverTestCase):
         class MyTaskSet(TaskSet):
             @task
             def interrupted_task(self):
-                with self.client.get("/ultra_fast", catch_response=True) as r:
+                with self.client.get("/ultra_fast", catch_response=True):
                     raise InterruptTaskSet()
 
         class MyUser(HttpUser):

{locust-2.25.1.dev17 → locust-2.26.1.dev7}/locust/test/test_main.py

@@ -811,7 +811,7 @@ class StandaloneIntegrationTests(ProcessIntegrationTest):
                 try:
                     response = requests.get(f"http://localhost:{port}/")
                 except ConnectionError:
-                    succcess = False
+                    success = False
                 try:
                     _, stderr = proc.communicate(timeout=5)
                 except subprocess.TimeoutExpired:
@@ -1084,7 +1084,7 @@ class StandaloneIntegrationTests(ProcessIntegrationTest):
         with mock_locustfile() as mocked:
             with temporary_file("", suffix=".html") as html_report_file_path:
                 try:
-                    output = subprocess.check_output(
+                    subprocess.check_output(
                         [
                             "locust",
                             "-f",

{locust-2.25.1.dev17 → locust-2.26.1.dev7}/locust/test/test_parser.py

@@ -69,6 +69,8 @@ class TestParser(unittest.TestCase):
             web-port = 45787
             headless = true
             tags = ["Critical", "Normal"]
+            [tool.something_else]
+            this = "should be ignored by locust"
             """
 
             file.write(config_data)
@@ -248,7 +250,7 @@ class TestArgumentParser(LocustTestCase):
     def test_parse_locustfile_empty_directory_error(self):
         with mock.patch("sys.stderr", new=StringIO()):
             with self.assertRaises(SystemExit):
-                locustfiles = parse_locustfile_option(
+                parse_locustfile_option(
                     args=[
                         "-f",
                         self.parent_dir.name,
@@ -258,7 +260,7 @@ class TestArgumentParser(LocustTestCase):
     def test_parse_locustfile_invalid_directory_error(self):
         with mock.patch("sys.stderr", new=StringIO()):
             with self.assertRaises(SystemExit):
-                locustfiles = parse_locustfile_option(
+                parse_locustfile_option(
                     args=[
                         "-f",
                         "non_existent_dir",
@@ -401,13 +403,12 @@ class TestFindLocustfiles(LocustTestCase):
     def test_find_locustfiles_with_multiple_locustfiles(self):
         with mock_locustfile() as mocked1:
             with mock_locustfile() as mocked2:
-                with mock_locustfile() as mocked3:
-                    locustfiles = find_locustfiles([mocked1.file_path, mocked2.file_path], False)
+                locustfiles = find_locustfiles([mocked1.file_path, mocked2.file_path], False)
 
-                    self.assertIn(mocked1.file_path, locustfiles)
-                    self.assertIn(mocked2.file_path, locustfiles)
+                self.assertIn(mocked1.file_path, locustfiles)
+                self.assertIn(mocked2.file_path, locustfiles)
 
-                    assert 2 == len(locustfiles)
+                assert 2 == len(locustfiles)
 
     def test_find_locustfiles_error_for_invalid_file_extension(self):
         with mock.patch("sys.stderr", new=StringIO()):
@@ -450,7 +451,7 @@ class TestLocustfileIsDirectory(LocustTestCase):
 
     def test_locustfile_is_directory_single_locustfile_without_file_extension(self):
         prefix_name = "foobar"
-        with NamedTemporaryFile(prefix=prefix_name, suffix=".py") as mocked:
+        with NamedTemporaryFile(prefix=prefix_name, suffix=".py"):
             is_dir = locustfile_is_directory([prefix_name])
             assert not is_dir