jenkins-bot has submitted this change and it was merged.
Change subject: Skip Token tests if user doesn't have rights
......................................................................
Skip Token tests if user doesn't have rights
Following tests will be skipped if user doesn't have rights:
site_tests.TestSiteTokens.*
site_tests.TestSiteObjectDeprecatedFunctions.test_token
site_tests.SiteUserTestCase2.testPatrol
Bug: T85353
Change-Id: I2bb23452880ce624c382bf7b5b8929a64f7e5fb7
---
M tests/site_tests.py
1 file changed, 16 insertions(+), 0 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/site_tests.py b/tests/site_tests.py
index 60bb7bb..fa138bd 100644
--- a/tests/site_tests.py
+++ b/tests/site_tests.py
@@ -53,6 +53,10 @@
mysite = self.get_site()
mainpage = self.get_mainpage()
ttype = "edit"
+ if ttype not in mysite.tokens:
+ raise unittest.SkipTest(
+ "Action '%s' not allowed for user %s on wiki %s"
+ % (ttype, mysite.user(), mysite))
try:
token = mysite.tokens[ttype]
except KeyError:
@@ -1160,6 +1164,11 @@
"""Test the site.patrol() method."""
mysite = self.get_site()
+ if 'patrol' not in mysite.tokens:
+ raise unittest.SkipTest(
+ "Action patrol is not allowed for user {0} on wiki {1}"
+ .format(mysite.user(), mysite))
+
rc = list(mysite.recentchanges(total=1))[0]
# site.patrol() needs params
@@ -1253,7 +1262,14 @@
raise unittest.SkipTest(
u'Site %s version %s is too low for this tests.'
% (self.mysite, self._version))
+
+ if in_tested not in self.mysite.tokens:
+ raise unittest.SkipTest(
+ 'Action %s is not allowed for user %s on wiki %s.'
+ % (in_tested, self.mysite.user(), self.mysite))
+
self.mysite.version = lambda: test_version
+
for ttype in ("edit", "move", additional_token):
try:
token = self.mysite.tokens[ttype]
--
To view, visit https://gerrit.wikimedia.org/r/181883
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2bb23452880ce624c382bf7b5b8929a64f7e5fb7
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Maverick <[email protected]>
Gerrit-Reviewer: John Vandenberg <[email protected]>
Gerrit-Reviewer: Ladsgroup <[email protected]>
Gerrit-Reviewer: Maverick <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
