From 9bd7c108e36ebc8531f182df495d7546182c71f8 Mon Sep 17 00:00:00 2001 From: Hok Kan Cheung Date: Mon, 15 Dec 2025 08:34:01 -0500 Subject: [PATCH] Update test_extension_throttle.py to deprecate download_delay --- tests/test_extension_throttle.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/tests/test_extension_throttle.py b/tests/test_extension_throttle.py index 4874f284a..b374885c7 100644 --- a/tests/test_extension_throttle.py +++ b/tests/test_extension_throttle.py @@ -63,10 +63,10 @@ def test_target_concurrency_invalid(value): ("spider", "setting", "expected"), [ (UNSET, UNSET, DOWNLOAD_DELAY), - (1.0, UNSET, 1.0), + (1.0, UNSET, DOWNLOAD_DELAY), (UNSET, 1.0, 1.0), - (1.0, 2.0, 1.0), - (3.0, 2.0, 3.0), + (1.0, 2.0, 2.0), + (3.0, 2.0, 2.0), ], ) def test_mindelay_definition(spider, setting, expected): @@ -82,8 +82,7 @@ def test_mindelay_definition(spider, setting, expected): crawler = get_crawler(settings, _TestSpider) at = build_from_crawler(AutoThrottle, crawler) - at._spider_opened(_TestSpider()) - assert at.mindelay == expected + assert at._min_delay(_TestSpider()) == expected @pytest.mark.parametrize( @@ -108,7 +107,7 @@ def test_maxdelay_definition(value, expected): [ (UNSET, UNSET, UNSET, AUTOTHROTTLE_START_DELAY), (AUTOTHROTTLE_START_DELAY - 1.0, UNSET, UNSET, AUTOTHROTTLE_START_DELAY), - (AUTOTHROTTLE_START_DELAY + 1.0, UNSET, UNSET, AUTOTHROTTLE_START_DELAY + 1.0), + (AUTOTHROTTLE_START_DELAY + 1.0, UNSET, UNSET, AUTOTHROTTLE_START_DELAY), (UNSET, AUTOTHROTTLE_START_DELAY - 1.0, UNSET, AUTOTHROTTLE_START_DELAY), (UNSET, AUTOTHROTTLE_START_DELAY + 1.0, UNSET, AUTOTHROTTLE_START_DELAY + 1.0), (UNSET, UNSET, AUTOTHROTTLE_START_DELAY - 1.0, AUTOTHROTTLE_START_DELAY - 1.0), @@ -117,13 +116,13 @@ def test_maxdelay_definition(value, expected): AUTOTHROTTLE_START_DELAY + 1.0, AUTOTHROTTLE_START_DELAY + 2.0, UNSET, - AUTOTHROTTLE_START_DELAY + 1.0, + AUTOTHROTTLE_START_DELAY + 2.0, ), ( AUTOTHROTTLE_START_DELAY + 2.0, UNSET, AUTOTHROTTLE_START_DELAY + 1.0, - AUTOTHROTTLE_START_DELAY + 2.0, + AUTOTHROTTLE_START_DELAY + 1.0, ), ( AUTOTHROTTLE_START_DELAY + 1.0, @@ -150,7 +149,11 @@ def test_startdelay_definition(min_spider, min_setting, start_setting, expected) at = build_from_crawler(AutoThrottle, crawler) spider = _TestSpider() at._spider_opened(spider) - assert spider.download_delay == expected + download_delay = min_setting if min_setting is not UNSET else DOWNLOAD_DELAY + autothrottle_start = ( + start_setting if start_setting is not UNSET else AUTOTHROTTLE_START_DELAY + ) + assert max(download_delay, autothrottle_start) == expected @pytest.mark.parametrize(