jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1009483?usp=email )
Change subject: [tests] Always reduce max_retries to 3 for tests ......................................................................
[tests] Always reduce max_retries to 3 for tests
Change-Id: Ie93bd991b5a6f4b3c7e2da771ba018d8609fe4b6 --- M .appveyor.yml M .github/workflows/login_tests-ci.yml M .github/workflows/oauth_tests-ci.yml M .github/workflows/pywikibot-ci.yml M .github/workflows/sysop_write_tests-ci.yml M tests/__init__.py 6 files changed, 15 insertions(+), 11 deletions(-)
Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved
diff --git a/.appveyor.yml b/.appveyor.yml index fa5353e..7ec6f33 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -81,7 +81,7 @@
- "mkdir %PYWIKIBOT_DIR%" - "python -Werror::UserWarning -m pwb generate_user_files -dir:%PYWIKIBOT_DIR% -family:wikipedia -lang:en -v -debug -user:%PYWIKIBOT_USERNAME%" - - ps: "[IO.File]::AppendAllText($env:PYWIKIBOT_USER_CONFIG, 'max_retries = 2; maximum_GET_length = 5000; transliteration_target = None;')" + - ps: "[IO.File]::AppendAllText($env:PYWIKIBOT_USER_CONFIG, 'maximum_GET_length = 5000; transliteration_target = None;')" - ps: "[IO.File]::AppendAllText($env:PYWIKIBOT_USER_CONFIG, 'noisysleep = float(''inf'');')" - ps: "[IO.File]::AppendAllText($env:PYWIKIBOT_USER_CONFIG, 'usernames[''wikipedia''][''test''] = ''{0}'';' -f $env:PYWIKIBOT_USERNAME)" - ps: "[IO.File]::AppendAllText($env:PYWIKIBOT_USER_CONFIG, 'usernames[''wikidata''][''test''] = ''{0}'';' -f $env:PYWIKIBOT_USERNAME)" diff --git a/.github/workflows/login_tests-ci.yml b/.github/workflows/login_tests-ci.yml index 5e17d16..5cc02a2 100644 --- a/.github/workflows/login_tests-ci.yml +++ b/.github/workflows/login_tests-ci.yml @@ -100,7 +100,6 @@ echo "usernames['wikidata']['test'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py echo "usernames['commons']['commons'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py echo "usernames['meta']['meta'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py - echo "max_retries = 3" >> user-config.py echo "noisysleep = float('inf')" >> user-config.py echo "maximum_GET_length = 5000" >> user-config.py echo "console_encoding = 'utf8'" >> user-config.py diff --git a/.github/workflows/oauth_tests-ci.yml b/.github/workflows/oauth_tests-ci.yml index 62ecf9a..f93c6dd 100644 --- a/.github/workflows/oauth_tests-ci.yml +++ b/.github/workflows/oauth_tests-ci.yml @@ -92,7 +92,6 @@ run: | python -Werror::UserWarning -m pwb generate_user_files -family:${{matrix.family}} -lang:${{matrix.code}} -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; echo "authenticate['${{ matrix.domain }}'] = ('${{ steps.split.outputs._0 }}', '${{ steps.split.outputs._1 }}', '${{ steps.split.outputs._2 }}', '${{ steps.split.outputs._3 }}')" >> user-config.py - echo "max_retries = 3" >> user-config.py echo "noisysleep = float('inf')" >> user-config.py echo "maximum_GET_length = 5000" >> user-config.py echo "console_encoding = 'utf8'" >> user-config.py diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index 7b3bc30..c57535b 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -108,7 +108,6 @@ echo "usernames['wikidata']['test'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py echo "usernames['commons']['commons'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py echo "usernames['meta']['meta'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py - echo "max_retries = 3" >> user-config.py echo "noisysleep = float('inf')" >> user-config.py echo "maximum_GET_length = 5000" >> user-config.py echo "console_encoding = 'utf8'" >> user-config.py diff --git a/.github/workflows/sysop_write_tests-ci.yml b/.github/workflows/sysop_write_tests-ci.yml index 4aafdd2..a2bde6f 100644 --- a/.github/workflows/sysop_write_tests-ci.yml +++ b/.github/workflows/sysop_write_tests-ci.yml @@ -68,7 +68,6 @@ python -Werror::UserWarning -m pwb generate_user_files -family:${{matrix.family}} -lang:${{matrix.code}} -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; echo "authenticate['${{ matrix.domain }}'] = ('${{ steps.split.outputs._0 }}', '${{ steps.split.outputs._1 }}', '${{ steps.split.outputs._2 }}', '${{ steps.split.outputs._3 }}')" >> user-config.py echo "usernames['wikipedia']['test'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py - echo "max_retries = 3" >> user-config.py echo "noisysleep = float('inf')" >> user-config.py echo "maximum_GET_length = 5000" >> user-config.py echo "console_encoding = 'utf8'" >> user-config.py diff --git a/tests/__init__.py b/tests/__init__.py index b9d2308..0660f96 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -262,17 +262,16 @@ lambda cls, *args: cls._make_dir(join_cache_path()))
-# AppVeyor and GitHub action builds are set to retry twice or thrice, which -# aims to reduce the number of 'red' builds caused by intermittent server -# problems, while also avoiding the builds taking a long time due to retries. # The following allows builds to retry up to three times, but higher default -# values are overridden here to restrict retries to only 1, so developer builds +# values are overridden here to restrict retries to only 3, so developer builds # fail more frequently in code paths resulting from mishandled server problems. +# This aims to reduce the number of 'red' builds caused by intermittent server +# problems, while also avoiding the builds taking a long time due to retries. if config.max_retries > 3: if 'PYWIKIBOT_TEST_QUIET' not in os.environ: unittest_print( - f'tests: max_retries reduced from {config.max_retries} to 1') - config.max_retries = 1 + f'tests: max_retries reduced from {config.max_retries} to 3') + config.max_retries = 3
# Raise CaptchaError if a test requires solving a captcha config.solve_captcha = False