Pywikibot-commits January 2022

pywikibot-commits@lists.wikimedia.org

1 participants
115 discussions

[Gerrit] ...core[master]: [bugfix] remove question mark character from forbidden file name char...

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/753092 ) Change subject: [bugfix] remove question mark character from forbidden file name characters ...................................................................... [bugfix] remove question mark character from forbidden file name characters The forbidden chars were introduced sometime before 2006 when some code parts was moved from interwiki.py script to interwiki_graph module. The original variant of compat's upload module only had '\\' as forbidden char and other checks are also made within page module especially inside Link initializer. Therefore I think the question mark kan safely be removed here. Bug: T93482 Change-Id: Iabbe639dce2bf42a422f59f7335df978473a3984 --- M pywikibot/specialbots/_upload.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Martineznovo: Looks good to me, but someone else must approve JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/specialbots/_upload.py b/pywikibot/specialbots/_upload.py index 20d9bb0..fe93944 100644 --- a/pywikibot/specialbots/_upload.py +++ b/pywikibot/specialbots/_upload.py @@ -243,7 +243,7 @@ filename = newfn # FIXME: these 2 belong somewhere else, presumably in family # forbidden characters are handled by pywikibot/page.py - forbidden = ':*?/\\' # to be extended + forbidden = ':*/\\' # to be extended try: allowed_formats = self.target_site.siteinfo.get( 'fileextensions', get_default=False) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/753092 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Iabbe639dce2bf42a422f59f7335df978473a3984 Gerrit-Change-Number: 753092 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Martineznovo <martineznovo(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 3 months

[Gerrit] ...core[master]: [W0074] refactor loop by any() call

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/753038 ) Change subject: [W0074] refactor loop by any() call ...................................................................... [W0074] refactor loop by any() call Change-Id: I006a30786c22bd8f15b37d085c068760d3ca50f5 --- M pywikibot/page/__init__.py M scripts/replace.py 2 files changed, 6 insertions(+), 10 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index 69df5ea..cf96533 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -734,9 +734,7 @@ static_keys = self.site.getmagicwords('staticredirect') text = self.get(get_redirect=True, force=force) if static_keys: - for key in static_keys: - if key in text: - return True + return any(key in text for key in static_keys) return False def isCategoryRedirect(self) -> bool: diff --git a/scripts/replace.py b/scripts/replace.py index 4d7f372..12cf5fe 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -138,7 +138,7 @@ the top of the help. """ # -# (C) Pywikibot team, 2004-2021 +# (C) Pywikibot team, 2004-2022 # # Distributed under the terms of the MIT license. # @@ -467,9 +467,8 @@ :rtype: bool """ if 'text-contains' in self.exceptions: - for exc in self.exceptions['text-contains']: - if exc.search(text): - return True + return any(exc.search(text) + for exc in self.exceptions['text-contains']) return False @@ -565,9 +564,8 @@ def isTextExcepted(self, original_text) -> bool: """Return True iff one of the exceptions applies for the given text.""" if 'text-contains' in self.exceptions: - for exc in self.exceptions['text-contains']: - if exc.search(original_text): - return True + return any(exc.search(original_text) + for exc in self.exceptions['text-contains']) return False def apply_replacements(self, original_text, applied, page=None): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/753038 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I006a30786c22bd8f15b37d085c068760d3ca50f5 Gerrit-Change-Number: 753038 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 3 months

[Gerrit] ...core[master]: [W0125] Use typing.TYPE_CHECKING instead of False

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/753042 ) Change subject: [W0125] Use typing.TYPE_CHECKING instead of False ...................................................................... [W0125] Use typing.TYPE_CHECKING instead of False Change-Id: I92990421d2e2b8349b048ee1ee72f89c494e219c --- M pywikibot/_wbtypes.py M pywikibot/bot.py 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/_wbtypes.py b/pywikibot/_wbtypes.py index 863fad8..744d8af 100644 --- a/pywikibot/_wbtypes.py +++ b/pywikibot/_wbtypes.py @@ -6,11 +6,11 @@ # import abc import json -from typing import Any, Optional +from typing import Any, Optional, TYPE_CHECKING from pywikibot.backports import Dict -if False: # typing.TYPE_CHECKING +if TYPE_CHECKING: from pywikibot.site import DataSite diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 7181014..ef061b2 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -106,7 +106,7 @@ from importlib import import_module from pathlib import Path from textwrap import fill -from typing import Any, Optional, Union +from typing import Any, Optional, TYPE_CHECKING, Union from warnings import warn import pywikibot @@ -181,7 +181,7 @@ from pywikibot.tools._logging import LoggingFormatter from pywikibot.tools.formatter import color_format -if False: # typing.TYPE_CHECKING +if TYPE_CHECKING: from pywikibot.site import BaseSite AnswerType = Union[ -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/753042 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I92990421d2e2b8349b048ee1ee72f89c494e219c Gerrit-Change-Number: 753042 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 3 months

[Gerrit] ...core[master]: [tests] Update login/logout tests action

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/753030 ) Change subject: [tests] Update login/logout tests action ...................................................................... [tests] Update login/logout tests action Change-Id: Ia0f5387da0c3ab219547b026a23cd061f19a080f --- M .github/workflows/login_tests-ci.yml 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.github/workflows/login_tests-ci.yml b/.github/workflows/login_tests-ci.yml index 85d92d2..61f96b4 100644 --- a/.github/workflows/login_tests-ci.yml +++ b/.github/workflows/login_tests-ci.yml @@ -77,9 +77,9 @@ python -m pip install --upgrade pip pip --version pip install -U setuptools - if [ -f dev-requirements.txt ]; then pip install -r dev-requirements.txt; fi - if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - pip install wikitextparser + pip install requests + pip install mwparserfromhell + pip install coverage python -c "import setuptools; print('setuptools:', setuptools.__version__)" - name: Generate family files @@ -118,4 +118,4 @@ PYWIKIBOT_TEST_PROD_ONLY: ${{ matrix.test_prod_only && 1 || 0 }} run: | python pwb.py version - coverage run -m unittest discover -vv -p \"login_logout_tests.py\" + coverage run -m unittest -vv tests/site_login_logout_tests.py -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/753030 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Ia0f5387da0c3ab219547b026a23cd061f19a080f Gerrit-Change-Number: 753030 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 3 months

[Gerrit] ...core[master]: [deps] Update setuptools dependency

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/753032 ) Change subject: [deps] Update setuptools dependency ...................................................................... [deps] Update setuptools dependency setuptools 50.3 still works with Python 3.5 Change-Id: I6232ca48cb3a8e65d41aaa28d9dca75a6620f6fc --- M requirements.txt M setup.py 2 files changed, 5 insertions(+), 4 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/requirements.txt b/requirements.txt index e74de65..69dc8da 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,8 +22,8 @@ requests>=2.20.1 ; python_version >= '3.6' setuptools>=48.0.0 ; python_version >= '3.10' setuptools>=38.5.2 ; python_version >= '3.7' and python_version < '3.10' -setuptools>=20.8.1 ; python_version >= '3.6' and python_version < '3.7' -setuptools>=20.8.1, !=50.0.0, <50.2.0 ; python_version < '3.6' +setuptools>=20.8.1, <59.7.0 ; python_version >= '3.6' and python_version < '3.7' +setuptools>=20.8.1, !=50.0.0, <51.0.0 ; python_version < '3.6' # MediaWiki markup parser # mwparserfromhell is default, wikitextparser can be used instead diff --git a/setup.py b/setup.py index 6c2323f..a2c976d 100644 --- a/setup.py +++ b/setup.py @@ -119,8 +119,9 @@ # PEP 440 'setuptools>=48.0.0 ; python_version >= "3.10"', 'setuptools>=38.5.2 ; python_version >= "3.7" and python_version < "3.10"', - 'setuptools>=20.8.1 ; python_version >= "3.6" and python_version < "3.7"', - 'setuptools>=20.8.1, !=50.0.0, <50.2.0 ; python_version < "3.6"', + 'setuptools>=20.8.1, <59.7.0 ' + '; python_version >= "3.6" and python_version < "3.7"', + 'setuptools>=20.8.1, !=50.0.0, <51.0.0 ; python_version < "3.6"', ] # in addition either mwparserfromhell or wikitextparser is required -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/753032 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I6232ca48cb3a8e65d41aaa28d9dca75a6620f6fc Gerrit-Change-Number: 753032 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 3 months

[Gerrit] ...core[master]: [tests] TestFormatInterwiki has not test_interwiki_format method

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/752718 ) Change subject: [tests] TestFormatInterwiki has not test_interwiki_format method ...................................................................... [tests] TestFormatInterwiki has not test_interwiki_format method The method was renamed and splitted. The test need 2 seconds to run. Change-Id: I4f1f729a03379855a59c8852f4f199553385d157 --- M tests/__init__.py 1 file changed, 3 insertions(+), 6 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/__init__.py b/tests/__init__.py index f802c45..a29fdff 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,6 +1,6 @@ """Package tests.""" # -# (C) Pywikibot team, 2007-2021 +# (C) Pywikibot team, 2007-2022 # # Distributed under the terms of the MIT license. # @@ -29,6 +29,7 @@ import pywikibot.data.api from pywikibot import config +from pywikibot.backports import Dict, List from pywikibot.data.api import CachedRequest from pywikibot.data.api import Request as _original_Request from pywikibot.tools import PYTHON_VERSION @@ -172,11 +173,7 @@ 'l10n', # pywikibot-i18n repository runs it } -disabled_tests = { - 'textlib': [ - 'test_interwiki_format', # example; very slow test - ], -} +disabled_tests = {} # type: Dict[str, List[str]] def _unknown_test_modules(): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/752718 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I4f1f729a03379855a59c8852f4f199553385d157 Gerrit-Change-Number: 752718 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 3 months

[Gerrit] ...core[master]: [tests] skip site_login_logout tests if environment var is not set

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/752715 ) Change subject: [tests] skip site_login_logout tests if environment var is not set ...................................................................... [tests] skip site_login_logout tests if environment var is not set Bug: T298761 Change-Id: I42495a466a83ec47078a238a66dc740cc0256d98 --- M .github/workflows/login_tests-ci.yml M .github/workflows/pywikibot-ci.yml M tests/site_login_logout_tests.py 3 files changed, 11 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.github/workflows/login_tests-ci.yml b/.github/workflows/login_tests-ci.yml index c4a7f37..85d92d2 100644 --- a/.github/workflows/login_tests-ci.yml +++ b/.github/workflows/login_tests-ci.yml @@ -6,13 +6,14 @@ on: workflow_run: - workflows: [ "pywikibot-ci" ] + workflows: [ "Pywikibot CI" ] branches: [ master, stable ] types: - completed env: PYWIKIBOT_TESTS_RUNNING: 1 + PYWIKIBOT_LOGIN_LOGOUT: 1 PYWIKIBOT_USERNAME: Pywikibot-test jobs: diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index 712e989..6631832 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -21,7 +21,7 @@ strategy: fail-fast: false - max-parallel: 8 + max-parallel: 9 matrix: python-version: ["pypy3", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"] @@ -91,7 +91,7 @@ - name: Generate user files run: | - if [ ${{matrix.site}} != 'False' ]; then + if [ ${{matrix.site}} != false ]; then python -Werror::UserWarning -m pwb generate_user_files -site:${{matrix.site}} -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; else python -Werror::UserWarning -m pwb generate_user_files -family:${{matrix.family}} -lang:${{matrix.code}} -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; diff --git a/tests/site_login_logout_tests.py b/tests/site_login_logout_tests.py index df1ba45..d53ff30 100644 --- a/tests/site_login_logout_tests.py +++ b/tests/site_login_logout_tests.py @@ -5,6 +5,7 @@ # # Distributed under the terms of the MIT license. # +import os import unittest from contextlib import suppress @@ -50,6 +51,12 @@ self.assertIsNone(site.user()) +def setUpModule(): # noqa: N802 + """Skip tests if PYWIKIBOT_LOGIN_LOGOUT variable is not set.""" + if os.environ.get('PYWIKIBOT_LOGIN_LOGOUT', '0') != '1': + raise unittest.SkipTest('login/logout tests ar disabled') + + if __name__ == '__main__': # pragma: no cover with suppress(SystemExit): unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/752715 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I42495a466a83ec47078a238a66dc740cc0256d98 Gerrit-Change-Number: 752715 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 3 months

[Gerrit] ...core[master]: [tests] Add login_tests-ci.yml

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/752704 ) Change subject: [tests] Add login_tests-ci.yml ...................................................................... [tests] Add login_tests-ci.yml login_logout_tests.py should not run in parallel tasks. This action only runs login_logout_tests.py with max-parallel: 1 and is invoked after other tests are finished. Bug: T298761 Change-Id: I236ffc5480cbb738c21d3cee566ab2889fc5e580 --- A .github/workflows/login_tests-ci.yml 1 file changed, 120 insertions(+), 0 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.github/workflows/login_tests-ci.yml b/.github/workflows/login_tests-ci.yml new file mode 100644 index 0000000..c4a7f37 --- /dev/null +++ b/.github/workflows/login_tests-ci.yml @@ -0,0 +1,120 @@ +# This workflow will install Python dependencies, run Pywikibot tests +# with a variety of Python versions. For more information see: +# https://help.github.com/actions/language-and-framework-guides/using-python-… + +name: Login CI + +on: + workflow_run: + workflows: [ "pywikibot-ci" ] + branches: [ master, stable ] + types: + - completed + +env: + PYWIKIBOT_TESTS_RUNNING: 1 + PYWIKIBOT_USERNAME: Pywikibot-test + +jobs: + build: + runs-on: ${{ matrix.os || 'ubuntu-latest' }} + continue-on-error: ${{ matrix.experimental || false }} + + strategy: + fail-fast: false + max-parallel: 1 + + matrix: + python-version: ["pypy3", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"] + site: ["wikipedia:en", "wikisource:zh"] + test_prod_only: [true] + include: + - python-version: "3.6" + site: False + family: wpbeta + code: en + experimental: true + - python-version: "3.6" + site: False + family: wpbeta + code: zh + experimental: true + - python-version: "3.5" + site: wsbeta:en + experimental: true + - python-version: "3.7" + site: "wikipedia:test" + - python-version: "3.7" + site: "wikidata:test" + - python-version: "3.9" + site: "wiktionary:ar" + test_no_rc: true + - python-version: "3.6" + site: "wikidata:wikidata" + - python-version: "3.8" + site: "wowwiki:uk" + experimental: true + - python-version: "3.11.0-alpha.2" + site: "wikipedia:test" + experimental: true + - python-version: 3 + site: "wikipedia:de" + os: macOS-latest + + steps: + - uses: actions/checkout@v2 + with: + submodules: true + + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip --version + pip install -U setuptools + if [ -f dev-requirements.txt ]; then pip install -r dev-requirements.txt; fi + if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + pip install wikitextparser + python -c "import setuptools; print('setuptools:', setuptools.__version__)" + + - name: Generate family files + run: | + if [ ${{matrix.family || 0}} == wpbeta ]; then + python pwb.py generate_family_file http://${{matrix.code}}.wikipedia.beta.wmflabs.org/ wpbeta y + fi + if [ ${{matrix.site || 0}} == 'wsbeta:en' ]; then + python pwb.py generate_family_file http://en.wikisource.beta.wmflabs.org/ wsbeta y + fi + + - name: Generate user files + run: | + if [ ${{matrix.site}} != 'False' ]; then + python -Werror::UserWarning -m pwb generate_user_files -site:${{matrix.site}} -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; + else + python -Werror::UserWarning -m pwb generate_user_files -family:${{matrix.family}} -lang:${{matrix.code}} -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; + fi + echo "usernames['wikipedia']['en'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py + echo "usernames['wikisource']['zh'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py + echo "usernames['wikipedia']['test'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py + 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 "maximum_GET_length = 5000" >> user-config.py + echo "console_encoding = 'utf8'" >> user-config.py + echo "import os" >> user-config.py + echo "password_file = os.path.expanduser('passwordfile')" >> user-config.py + echo "('${{ env.PYWIKIBOT_USERNAME }}', '${{ secrets.PYWIKIBOT_USERPWD }}')" > passwordfile + + - name: Test with unittest + env: + PYWIKIBOT_TEST_NO_RC: + ${{ (matrix.site == 'wikisource:zh' || matrix.test_no_rc) && 1 || 0 }} + PYWIKIBOT_TEST_PROD_ONLY: ${{ matrix.test_prod_only && 1 || 0 }} + run: | + python pwb.py version + coverage run -m unittest discover -vv -p \"login_logout_tests.py\" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/752704 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I236ffc5480cbb738c21d3cee566ab2889fc5e580 Gerrit-Change-Number: 752704 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-MessageType: merged

2 years, 3 months

[Gerrit] ...core[master]: [tests] Remove TestLoginLogout test from site_tests

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/752690 ) Change subject: [tests] Remove TestLoginLogout test from site_tests ...................................................................... [tests] Remove TestLoginLogout test from site_tests TestLoginLogout test should not run in parallel tasks. Otherwise tests could fail when user is logged out. Bug: T298892 Change-Id: I6590d56b5ae4ccb60579ae30f1dc9fa3117e8446 --- A tests/site_login_logout_tests.py M tests/site_tests.py 2 files changed, 55 insertions(+), 36 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/site_login_logout_tests.py b/tests/site_login_logout_tests.py new file mode 100644 index 0000000..df1ba45 --- /dev/null +++ b/tests/site_login_logout_tests.py @@ -0,0 +1,55 @@ +#!/usr/bin/python3 +"""Test for login and logout methods.""" +# +# (C) Pywikibot team, 2022 +# +# Distributed under the terms of the MIT license. +# +import unittest +from contextlib import suppress + +import pywikibot +from pywikibot.exceptions import APIError + +from tests.aspects import DefaultSiteTestCase + + +class TestLoginLogout(DefaultSiteTestCase): + + """Test for login and logout methods.""" + + login = True + + def test_login_logout(self): + """Validate login and logout methods by toggling the state.""" + site = self.get_site() + loginstatus = pywikibot.login.LoginStatus + + self.assertTrue(site.logged_in()) + self.assertIn(site._loginstatus, (loginstatus.IN_PROGRESS, + loginstatus.AS_USER)) + self.assertIn('_userinfo', site.__dict__.keys()) + + self.assertIsNone(site.login()) + + if site.is_oauth_token_available(): + with self.assertRaisesRegex(APIError, 'cannotlogout.*OAuth'): + site.logout() + self.assertTrue(site.logged_in()) + self.assertIn(site._loginstatus, (loginstatus.IN_PROGRESS, + loginstatus.AS_USER)) + self.assertIn('_userinfo', site.__dict__.keys()) + + # Fandom family wikis don't support API action=logout + elif 'fandom.com' not in site.hostname(): + site.logout() + self.assertFalse(site.logged_in()) + self.assertEqual(site._loginstatus, loginstatus.NOT_LOGGED_IN) + self.assertNotIn('_userinfo', site.__dict__.keys()) + + self.assertIsNone(site.user()) + + +if __name__ == '__main__': # pragma: no cover + with suppress(SystemExit): + unittest.main() diff --git a/tests/site_tests.py b/tests/site_tests.py index d8c1e06..7ffb9a2 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -3580,42 +3580,6 @@ self.assertIsNone(page) -class TestLoginLogout(DefaultSiteTestCase): - - """Test for login and logout methods.""" - - login = True - - def test_login_logout(self): - """Validate login and logout methods by toggling the state.""" - site = self.get_site() - loginstatus = pywikibot.login.LoginStatus - - self.assertTrue(site.logged_in()) - self.assertIn(site._loginstatus, (loginstatus.IN_PROGRESS, - loginstatus.AS_USER)) - self.assertIn('_userinfo', site.__dict__.keys()) - - self.assertIsNone(site.login()) - - if site.is_oauth_token_available(): - with self.assertRaisesRegex(APIError, 'cannotlogout.*OAuth'): - site.logout() - self.assertTrue(site.logged_in()) - self.assertIn(site._loginstatus, (loginstatus.IN_PROGRESS, - loginstatus.AS_USER)) - self.assertIn('_userinfo', site.__dict__.keys()) - - # Fandom family wikis don't support API action=logout - elif 'fandom.com' not in site.hostname(): - site.logout() - self.assertFalse(site.logged_in()) - self.assertEqual(site._loginstatus, loginstatus.NOT_LOGGED_IN) - self.assertNotIn('_userinfo', site.__dict__.keys()) - - self.assertIsNone(site.user()) - - class TestClearCookies(TestCase): """Test cookies are cleared after logout.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/752690 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I6590d56b5ae4ccb60579ae30f1dc9fa3117e8446 Gerrit-Change-Number: 752690 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 3 months

[Gerrit] ...core[master]: [tests] Enable logged in tests with github actions

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/752676 ) Change subject: [tests] Enable logged in tests with github actions ...................................................................... [tests] Enable logged in tests with github actions - set PYWIKIBOT_USERNAME environment - Password is set by secrets on github - increase max-parallel - always set site, otherwise the test is not collected - add usernames settings to config file - create password file Bug: T296371 Change-Id: I931c63e9b387b9f85fdfb4f1e047536f4445f936 --- M .github/workflows/pywikibot-ci.yml 1 file changed, 16 insertions(+), 4 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index 4eaef12..712e989 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -12,6 +12,7 @@ env: PYWIKIBOT_TESTS_RUNNING: 1 + PYWIKIBOT_USERNAME: Pywikibot-test jobs: build: @@ -20,7 +21,7 @@ strategy: fail-fast: false - max-parallel: 7 + max-parallel: 8 matrix: python-version: ["pypy3", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"] @@ -28,10 +29,12 @@ test_prod_only: [true] include: - python-version: "3.6" + site: False family: wpbeta code: en experimental: true - python-version: "3.6" + site: False family: wpbeta code: zh experimental: true @@ -88,14 +91,23 @@ - name: Generate user files run: | - if [ ${{matrix.site}} ]; then - python -Werror::UserWarning -m pwb generate_user_files -site:${{matrix.site}} -v -debug + if [ ${{matrix.site}} != 'False' ]; then + python -Werror::UserWarning -m pwb generate_user_files -site:${{matrix.site}} -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; else - python -Werror::UserWarning -m pwb generate_user_files -family:${{matrix.family}} -lang:${{matrix.code}} -v -debug + python -Werror::UserWarning -m pwb generate_user_files -family:${{matrix.family}} -lang:${{matrix.code}} -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; fi + echo "usernames['wikipedia']['en'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py + echo "usernames['wikisource']['zh'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py + echo "usernames['wikipedia']['test'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py + 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 "maximum_GET_length = 5000" >> user-config.py echo "console_encoding = 'utf8'" >> user-config.py + echo "import os" >> user-config.py + echo "password_file = os.path.expanduser('passwordfile')" >> user-config.py + echo "('${{ env.PYWIKIBOT_USERNAME }}', '${{ secrets.PYWIKIBOT_USERPWD }}')" > passwordfile - name: Test with unittest env: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/752676 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I931c63e9b387b9f85fdfb4f1e047536f4445f936 Gerrit-Change-Number: 752676 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 3 months

← Newer
1
2
3
4
5
6
7
8
9
...
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits January 2022