jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/650094 )
Change subject: [bugfix] Use btrfs family for old tests in logentries_tests.py ......................................................................
[bugfix] Use btrfs family for old tests in logentries_tests.py
- Other wowwiki sites are merged to ME 1.33. Use btrfs family for 'old' test which is still 1.19.24 - Create btrfs family as AutoFamily and assign it to the sites dict - update aspects to use AutoFamily.name if no str is given with sites['family']
Bug: T268971 Change-Id: Ibf1c1a14836557621aac6acc4489ef9c1e37afa6 --- M tests/aspects.py M tests/logentries_tests.py 2 files changed, 7 insertions(+), 3 deletions(-)
Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified
diff --git a/tests/aspects.py b/tests/aspects.py index 8a8d29b..b48b1cb 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -673,7 +673,8 @@ self.site = sitedata['site'] func(self, key)
- sitename = sitedata['family'] + ':' + sitedata['code'] + # sitedata['family'] may be an AutoFamily. Use str() for its name + sitename = str(sitedata['family']) + ':' + sitedata['code'] if func.__doc__: if func.__doc__.endswith('.'): wrapped_method.__doc__ = func.__doc__[:-1] diff --git a/tests/logentries_tests.py b/tests/logentries_tests.py index 9b7f1b9..3f685af 100644 --- a/tests/logentries_tests.py +++ b/tests/logentries_tests.py @@ -12,6 +12,7 @@ import pywikibot
from pywikibot.exceptions import HiddenKeyError +from pywikibot.family import AutoFamily from pywikibot.logentries import ( LogEntryFactory, OtherLogEntry, UserTargetLogEntry)
@@ -50,8 +51,10 @@ 'target': None, }, 'old': { - 'family': 'wowwiki', - 'code': 'hu', + 'family': AutoFamily('btrfs', + # /api.php required for scriptpath() + 'https://btrfs.wiki.kernel.org/api.php'), + 'code': 'btrfs', 'target': None, } }