Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

1 participants
13243 discussions

[Gerrit] ...core[master]: [9.2] Restore Pywikibot 9.2 for further developing

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1026709?usp=email ) Change subject: [9.2] Restore Pywikibot 9.2 for further developing ...................................................................... [9.2] Restore Pywikibot 9.2 for further developing Change-Id: I6e1895685ae917095539f1a7efe93ab2130fbbd3 --- M .appveyor.yml M HISTORY.rst M ROADMAP.rst M pywikibot/__metadata__.py M scripts/__init__.py 5 files changed, 13 insertions(+), 6 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/.appveyor.yml b/.appveyor.yml index 6fb8acf..96d787b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,7 +1,7 @@ image: Visual Studio 2022 clone_depth: 50 skip_tags: true -version: 9.1.{build} +version: 9.2.{build} environment: PYWIKIBOT_DIR: "%appdata%\\Pywikibot" diff --git a/HISTORY.rst b/HISTORY.rst index 3415a6d..fc240b8 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,6 +1,15 @@ Release history =============== +9.1.2 +----- +*03 May 2024* + +* Remove line endings in :func:`version.getversion_nightly` (:phab:`T363943`) +* Provide ``-nouser`` option with :mod:`pywikibot.scripts.version` +* i18n updates + + 9.1.1 ----- *27 April 2024* diff --git a/ROADMAP.rst b/ROADMAP.rst index 80c71e0..19cb97f 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,9 +1,7 @@ Current release --------------- -* Remove line endings in :func:`version.getversion_nightly` (:phab:`T363943`) -* Provide ``-nouser`` option with :mod:`pywikibot.scripts.version` -* i18n updates +* (no changes yet) Deprecations ------------ diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index a4b4218..362e90a 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -12,6 +12,6 @@ from time import strftime -__version__ = '9.1.2' +__version__ = '9.2.0.dev2' __url__ = 'https://www.mediawiki.org/wiki/Manual:Pywikibot' __copyright__ = f'2003-{strftime("%Y")}, Pywikibot team' diff --git a/scripts/__init__.py b/scripts/__init__.py index 13b4564..01864c7 100644 --- a/scripts/__init__.py +++ b/scripts/__init__.py @@ -32,4 +32,4 @@ # # Distributed under the terms of the MIT license. # -__version__ = '9.1.2' +__version__ = '9.2.0' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1026709?usp=email 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: I6e1895685ae917095539f1a7efe93ab2130fbbd3 Gerrit-Change-Number: 1026709 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <dalangi-ctr(a)wikimedia.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 week, 1 day

[Gerrit] ...core[stable]: Merge branch 'master' into stable

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1026708?usp=email ) Change subject: Merge branch 'master' into stable ...................................................................... Merge branch 'master' into stable Change-Id: I41f97108af8d0eb554d57766e14bfdb52c56d862 --- M scripts/__init__.py 2 files changed, 30 insertions(+), 4 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/scripts/__init__.py b/scripts/__init__.py index af4197d..13b4564 100644 --- a/scripts/__init__.py +++ b/scripts/__init__.py @@ -32,8 +32,4 @@ # # Distributed under the terms of the MIT license. # -<<<<<<< HEAD (fdb76b Update git submodules) -__version__ = '9.1.1' -======= __version__ = '9.1.2' ->>>>>>> BRANCH (cc9abc [9.1.2] Publish Pywikibot 9.1.2) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1026708?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: stable Gerrit-Change-Id: I41f97108af8d0eb554d57766e14bfdb52c56d862 Gerrit-Change-Number: 1026708 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <dalangi-ctr(a)wikimedia.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 week, 1 day

[Gerrit] ...core[master]: [9.1.2] Publish Pywikibot 9.1.2

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1026705?usp=email ) Change subject: [9.1.2] Publish Pywikibot 9.1.2 ...................................................................... [9.1.2] Publish Pywikibot 9.1.2 Change-Id: I80f6d352b6a16fd8d6dfa12ac40d68a989c42077 --- M .appveyor.yml M ROADMAP.rst M pywikibot/__metadata__.py M pywikibot/scripts/version.py M scripts/__init__.py 5 files changed, 8 insertions(+), 6 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.appveyor.yml b/.appveyor.yml index 96d787b..6fb8acf 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,7 +1,7 @@ image: Visual Studio 2022 clone_depth: 50 skip_tags: true -version: 9.2.{build} +version: 9.1.{build} environment: PYWIKIBOT_DIR: "%appdata%\\Pywikibot" diff --git a/ROADMAP.rst b/ROADMAP.rst index 19cb97f..80c71e0 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,7 +1,9 @@ Current release --------------- -* (no changes yet) +* Remove line endings in :func:`version.getversion_nightly` (:phab:`T363943`) +* Provide ``-nouser`` option with :mod:`pywikibot.scripts.version` +* i18n updates Deprecations ------------ diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index 0eae51b..a4b4218 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -12,6 +12,6 @@ from time import strftime -__version__ = '9.2.0.dev1' +__version__ = '9.1.2' __url__ = 'https://www.mediawiki.org/wiki/Manual:Pywikibot' __copyright__ = f'2003-{strftime("%Y")}, Pywikibot team' diff --git a/pywikibot/scripts/version.py b/pywikibot/scripts/version.py index 0bc0af8..3d02378 100755 --- a/pywikibot/scripts/version.py +++ b/pywikibot/scripts/version.py @@ -7,7 +7,7 @@ .. versionchanged:: 7.0 version script was moved to the framework scripts folder -.. versionadded:: 9.2 +.. versionadded:: 9.1.2 the *-nouser* option. """ # @@ -59,7 +59,7 @@ def main(*args: str) -> None: """Print pywikibot version and important settings. - .. versionchanged:: 9.2 + .. versionchanged:: 9.1.2 usernames are not printed with ``-nouser`` option. """ pywikibot.info('Pywikibot: ' + getversion()) diff --git a/scripts/__init__.py b/scripts/__init__.py index 01864c7..13b4564 100644 --- a/scripts/__init__.py +++ b/scripts/__init__.py @@ -32,4 +32,4 @@ # # Distributed under the terms of the MIT license. # -__version__ = '9.2.0' +__version__ = '9.1.2' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1026705?usp=email 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: I80f6d352b6a16fd8d6dfa12ac40d68a989c42077 Gerrit-Change-Number: 1026705 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <dalangi-ctr(a)wikimedia.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 week, 1 day

[Gerrit] ...core[master]: [tests] update version_tests.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1026634?usp=email ) Change subject: [tests] update version_tests.py ...................................................................... [tests] update version_tests.py Bug: T363943 Change-Id: I80ab8950507a6ebb4408cf619f99c094d151b293 Signed-off-by: Xqt <info(a)gno.de> --- M tests/version_tests.py 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/version_tests.py b/tests/version_tests.py index c9364f5..217bbd2 100644 --- a/tests/version_tests.py +++ b/tests/version_tests.py @@ -25,15 +25,14 @@ net = False - @unittest.expectedFailure # T363943 def test_nightly_version(self): """Test version file of nightly dump.""" path = Path(__file__).parent / 'data' tag, rev, date, hsh, *dummy = version.getversion_nightly(path) - self.assertEqual(tag, 'nightly/core') + self.assertEqual(tag, 'nightly/core_stable') self.assertEqual(rev, '1') self.assertIsInstance(date, time.struct_time) - self.assertEqual(hsh, '567a31d') + self.assertEqual(hsh, 'e8f64f2') self.assertEqual(dummy, []) def test_package_version(self): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1026634?usp=email 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: I80ab8950507a6ebb4408cf619f99c094d151b293 Gerrit-Change-Number: 1026634 Gerrit-PatchSet: 5 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 week, 1 day

[Gerrit] ...core[master]: version.py: Remove line endings in getversion_nightly

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1026185?usp=email ) Change subject: version.py: Remove line endings in getversion_nightly ...................................................................... version.py: Remove line endings in getversion_nightly The version strings are eventually passed into the user agent, and having a linebreak results in a user agent such as: script (wikipedia:test; User:Bot) Pywikibot/9.2.0.dev1 (1\n) requests/2.28.2 Python/3.9.2.final.0 This \n causes the result to fail with error: pywikibot.exceptions.FatalServerError: Invalid leading whitespace, reserved character(s), or returncharacter(s) in header value. Fix this by, instead of using readlines, which preserves the line endings, read the entire file and split by linebreak, which implicitly removes all the line endings. Bug: T363943 Change-Id: I38f9b27d3339916dc6b784ecda602055924aa6bc --- M pywikibot/version.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/version.py b/pywikibot/version.py index 542c480..40793a0 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -259,7 +259,7 @@ file = Path(path or _get_program_dir()) / 'pywikibot' / 'version' with file.open() as data: - (tag, rev, date, hsh) = data.readlines() + (tag, rev, date, hsh) = data.read().splitlines() date = time.strptime(date[:19], '%Y-%m-%dT%H:%M:%S') -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1026185?usp=email 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: I38f9b27d3339916dc6b784ecda602055924aa6bc Gerrit-Change-Number: 1026185 Gerrit-PatchSet: 3 Gerrit-Owner: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 week, 1 day

[Gerrit] ...core[master]: [tests] Add version_tests.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1026462?usp=email ) Change subject: [tests] Add version_tests.py ...................................................................... [tests] Add version_tests.py Currently test_nightly_version method will fail until T363943 is solved. Bug: T363943 Change-Id: Ie3c26c84927d4561fadb2b23bcd94126f8216b6f --- M docs/tests_ref/index.rst A docs/tests_ref/version_tests.rst M pywikibot/version.py A tests/data/version A tests/version_tests.py 5 files changed, 88 insertions(+), 3 deletions(-) Approvals: Zhuyifei1999: Looks good to me, approved Framawiki: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/docs/tests_ref/index.rst b/docs/tests_ref/index.rst index 7340817..2072f0e 100644 --- a/docs/tests_ref/index.rst +++ b/docs/tests_ref/index.rst @@ -81,6 +81,7 @@ ui<./ui_tests> user<./user_tests> utils + version<./version_tests> wikibase_edit<./wikibase_edit_tests> wikibase<./wikibase_tests> wikistats<./wikistats_tests> diff --git a/docs/tests_ref/version_tests.rst b/docs/tests_ref/version_tests.rst new file mode 100644 index 0000000..d08e1be --- /dev/null +++ b/docs/tests_ref/version_tests.rst @@ -0,0 +1,8 @@ +*************************** +tests.version\_tests module +*************************** + +.. automodule:: tests.version_tests + :members: + :undoc-members: + :show-inheritance: diff --git a/pywikibot/version.py b/pywikibot/version.py index 542c480..db6a084 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -241,7 +241,7 @@ return (tag, rev, date, hsh) -def getversion_nightly(path: str | Path | None = None): # pragma: no cover +def getversion_nightly(path: str | Path | None = None): """Get version info for a nightly release. .. hint:: @@ -256,7 +256,10 @@ - hash (git hash for the current revision) :rtype: ``tuple`` of three ``str`` and a ``time.struct_time`` """ - file = Path(path or _get_program_dir()) / 'pywikibot' / 'version' + file = Path(path or _get_program_dir()) + if not path: + file /= 'pywikibot' + file /= 'version' with file.open() as data: (tag, rev, date, hsh) = data.readlines() @@ -287,7 +290,7 @@ return (tag, rev, date, hsh) -def getversion_onlinerepo(path: str = 'branches/master'): +def getversion_onlinerepo(path: str = 'branches/master') -> str: """Retrieve current framework git hash from Gerrit.""" # Gerrit API responses include )]}' at the beginning, # make sure to strip it out diff --git a/tests/data/version b/tests/data/version new file mode 100644 index 0000000..91f8372 --- /dev/null +++ b/tests/data/version @@ -0,0 +1,4 @@ +nightly/core_stable +1 +2024-05-02T01:04:51 +e8f64f2 diff --git a/tests/version_tests.py b/tests/version_tests.py new file mode 100644 index 0000000..c9364f5 --- /dev/null +++ b/tests/version_tests.py @@ -0,0 +1,69 @@ +#!/usr/bin/env python3 +"""Test cases for the :mod:`version` module. + +.. versionadded:: 9.2 +""" +# +# (C) Pywikibot team, 2024 +# +# Distributed under the terms of the MIT license. +# +from __future__ import annotations + +import time +import unittest +from contextlib import suppress +from pathlib import Path + +from pywikibot import version +from tests.aspects import TestCase + + +class LocalVersionTestCase(TestCase): + + """Test local version infomation.""" + + net = False + + @unittest.expectedFailure # T363943 + def test_nightly_version(self): + """Test version file of nightly dump.""" + path = Path(__file__).parent / 'data' + tag, rev, date, hsh, *dummy = version.getversion_nightly(path) + self.assertEqual(tag, 'nightly/core') + self.assertEqual(rev, '1') + self.assertIsInstance(date, time.struct_time) + self.assertEqual(hsh, '567a31d') + self.assertEqual(dummy, []) + + def test_package_version(self): + """Test package version.""" + tag, rev, date, hsh, *dummy = version.getversion_package() + self.assertEqual(tag, 'pywikibot/__init__.py') + self.assertEqual(rev, '-1 (unknown)') + self.assertIsInstance(date, time.struct_time) + self.assertEqual(hsh, '') + self.assertEqual(dummy, []) + + +class RemoteVersionTestCase(TestCase): + + """Test remote version infomation.""" + + net = True + + def test_onlinerepo_version(self): + """Test online repository hash.""" + for branch in ('master', 'stable'): + with self.subTest(branch=branch): + hsh = version.getversion_onlinerepo('branches/' + branch) + try: + int(hsh, 16) + except ValueError: + self.fail( + f'{hsh!r} is not a valid hash of {branch} branch') + + +if __name__ == '__main__': + with suppress(SystemExit): + unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1026462?usp=email 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: Ie3c26c84927d4561fadb2b23bcd94126f8216b6f Gerrit-Change-Number: 1026462 Gerrit-PatchSet: 6 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 week, 1 day

[Gerrit] ...core[master]: [cleanup] i18n.TranslationError was removed in Pywikibot 7

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1026598?usp=email ) Change subject: [cleanup] i18n.TranslationError was removed in Pywikibot 7 ...................................................................... [cleanup] i18n.TranslationError was removed in Pywikibot 7 Change-Id: I37be3ce061631b9a77db4c27d30fd7767ff87eac --- M pywikibot/exceptions.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py index 998c2c8..9104e7b 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -77,11 +77,11 @@ - NoUsernameError: Username is not in user config file, or it is invalid. - PageInUseError: Page cannot be reserved due to a lock - SectionError: The section specified by # does not exist - - TranslationError: no language translation found + - TranslationError: no language translation found, i18n/l10n message + not available - UnknownExtensionError: Extension is not defined for this site - UserRightsError: insufficient rights for requested action - VersionParseError: failed to parse version information - - i18n.TranslationError: i18n/l10n message not available APIError: wiki API returned an error -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1026598?usp=email 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: I37be3ce061631b9a77db4c27d30fd7767ff87eac Gerrit-Change-Number: 1026598 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 week, 1 day

[Gerrit] ...core[master]: [tests] upload_tests is a framework test rather than a script test

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1026584?usp=email ) Change subject: [tests] upload_tests is a framework test rather than a script test ...................................................................... [tests] upload_tests is a framework test rather than a script test Change-Id: Ic1a734bbce7e7e7ed22cf7a4036f6da91b027a45 --- M docs/tests_ref/index.rst 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/docs/tests_ref/index.rst b/docs/tests_ref/index.rst index 7340817..22fed99 100644 --- a/docs/tests_ref/index.rst +++ b/docs/tests_ref/index.rst @@ -79,6 +79,7 @@ tools<./tools_tests> ui_options<./ui_options_tests> ui<./ui_tests> + upload<./upload_tests> user<./user_tests> utils wikibase_edit<./wikibase_edit_tests> @@ -117,5 +118,4 @@ reflinks<./reflinks_tests> replacebot<./replacebot_tests> template_bot<./template_bot_tests> - upload<./upload_tests> uploadbot<./uploadbot_tests> -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1026584?usp=email 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: Ic1a734bbce7e7e7ed22cf7a4036f6da91b027a45 Gerrit-Change-Number: 1026584 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 week, 2 days

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/1026541?usp=email ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I7d952612f210a6014f3db8327d5514d59c148036 --- M category/tly.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/category/tly.json b/category/tly.json index a2a795b..4813561 100644 --- a/category/tly.json +++ b/category/tly.json @@ -16,5 +16,5 @@ "category-section-title": "Сәһифә тарихи че канәку %(oldcat)s", "category-version-history": "Робот: Тарихи чы kanə версијәку огәте %(oldcat)s", "category-was-disbanded": "Bot: Kateqoriya ләғв кардә быә", - "category-was-moved": "Bot: Kateqoriya тожәдан ном ноә быә [[:Category:%(newcat)s|%(title)s]]" + "category-was-moved": "Bot: Bə kategorijə tožə nom noə byə [[:Category:%(newcat)s|%(title)s]]" } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/1026541?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Change-Id: I7d952612f210a6014f3db8327d5514d59c148036 Gerrit-Change-Number: 1026541 Gerrit-PatchSet: 1 Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 week, 2 days

[Gerrit] ...core[master]: [tests] move OAuthEditTest from edit_tests.py to oauth_tests.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1025771?usp=email ) Change subject: [tests] move OAuthEditTest from edit_tests.py to oauth_tests.py ...................................................................... [tests] move OAuthEditTest from edit_tests.py to oauth_tests.py Change-Id: I10a827744d7344114b03752b64ad34b510210477 --- M tests/edit_tests.py M tests/oauth_tests.py 2 files changed, 42 insertions(+), 40 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/edit_tests.py b/tests/edit_tests.py index 93e6cdb..415be0a 100755 --- a/tests/edit_tests.py +++ b/tests/edit_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """Tests for editing pages.""" # -# (C) Pywikibot team, 2015-2022 +# (C) Pywikibot team, 2015-2024 # # Distributed under the terms of the MIT license. # @@ -12,10 +12,9 @@ from contextlib import suppress import pywikibot -from pywikibot import config, page_put_queue +from pywikibot import page_put_queue from pywikibot.exceptions import Error from tests.aspects import TestCase, require_version -from tests.oauth_tests import OAuthSiteTestCase called_back = False @@ -176,42 +175,6 @@ self.assertEqual(dest.revision_count(), 2) -class OAuthEditTest(OAuthSiteTestCase): - - """Run edit test with OAuth enabled.""" - - family = 'wikipedia' - code = 'test' - - write = True - - def setUp(self): - """Set up test by checking site and initialization.""" - super().setUp() - self._authenticate = config.authenticate - oauth_tokens = self.consumer_token + self.access_token - config.authenticate[self.site.hostname()] = oauth_tokens - - def tearDown(self): - """Tear down test by resetting config.authenticate.""" - super().tearDown() - config.authenticate = self._authenticate - - def test_edit(self): - """Test editing to a page.""" - self.site.login() - self.assertTrue(self.site.logged_in()) - ts = str(time.time()) - p = pywikibot.Page(self.site, - f'User:{self.site.username()}/edit test') - p.site.editpage(p, appendtext=ts) - revision_id = p.latest_revision_id - p = pywikibot.Page(self.site, - f'User:{self.site.username()}/edit test') - self.assertEqual(revision_id, p.latest_revision_id) - self.assertTrue(p.text.endswith(ts)) - - if __name__ == '__main__': with suppress(SystemExit): unittest.main() diff --git a/tests/oauth_tests.py b/tests/oauth_tests.py index 345d4f3..836b91a 100755 --- a/tests/oauth_tests.py +++ b/tests/oauth_tests.py @@ -1,15 +1,18 @@ #!/usr/bin/env python3 """Test OAuth functionality.""" # -# (C) Pywikibot team, 2015-2023 +# (C) Pywikibot team, 2015-2024 # # Distributed under the terms of the MIT license. # from __future__ import annotations import os +import time from contextlib import suppress +import pywikibot +from pywikibot import config from pywikibot.login import OauthLoginManager from tests.aspects import ( DefaultSiteTestCase, @@ -46,6 +49,42 @@ self.access_token = tokens[2:] +class OAuthEditTest(OAuthSiteTestCase): + + """Run edit test with OAuth enabled.""" + + family = 'wikipedia' + code = 'test' + + write = True + + def setUp(self): + """Set up test by checking site and initialization.""" + super().setUp() + self._authenticate = config.authenticate + oauth_tokens = self.consumer_token + self.access_token + config.authenticate[self.site.hostname()] = oauth_tokens + + def tearDown(self): + """Tear down test by resetting config.authenticate.""" + super().tearDown() + config.authenticate = self._authenticate + + def test_edit(self): + """Test editing to a page.""" + self.site.login() + self.assertTrue(self.site.logged_in()) + ts = str(time.time()) + p = pywikibot.Page(self.site, + f'User:{self.site.username()}/edit test') + p.site.editpage(p, appendtext=ts) + revision_id = p.latest_revision_id + p = pywikibot.Page(self.site, + f'User:{self.site.username()}/edit test') + self.assertEqual(revision_id, p.latest_revision_id) + self.assertTrue(p.text.endswith(ts)) + + class TestOauthLoginManger(DefaultSiteTestCase, OAuthSiteTestCase): """Test OAuth login manager.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1025771?usp=email 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: I10a827744d7344114b03752b64ad34b510210477 Gerrit-Change-Number: 1025771 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 week, 3 days

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits