jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1197032?usp=email )
Change subject: Tests: fix TestIndexPageMappings.test_get_page_and_number tests
......................................................................
Tests: fix TestIndexPageMappings.test_get_page_and_number tests
- remove duplicate error tests
- test get_page and get_number with non-empty lists
Change-Id: I602e31dcb8f52017bc7651bd0034e15ff16e783b
---
M tests/proofreadpage_tests.py
1 file changed, 4 insertions(+), 9 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/proofreadpage_tests.py b/tests/proofreadpage_tests.py
index 55c4da0..cad13bc 100755
--- a/tests/proofreadpage_tests.py
+++ b/tests/proofreadpage_tests.py
@@ -791,11 +791,6 @@
self.assertEqual(index_page.get_page_number_from_label(str(label)),
num_set)
- # Error if label does not exists.
- label, num_set = 'dummy label', []
- with self.assertRaises(KeyError):
- index_page.get_page_number_from_label('dummy label')
-
# Test get_page_from_label.
for label, page_set in data['get_page']:
# Get set of pages from label with label as int or str.
@@ -804,10 +799,6 @@
self.assertEqual(index_page.get_page_from_label(str(label)),
page_set)
- # Error if label does not exists.
- with self.assertRaises(KeyError):
- index_page.get_page_from_label('dummy label')
-
# Test get_page.
for n in num_set:
p = index_page.get_page(n)
@@ -818,6 +809,10 @@
n = index_page.get_number(p)
self.assertEqual(index_page.get_page(n), p)
+ # Error if label does not exists.
+ with self.assertRaises(KeyError):
+ index_page.get_page_number_from_label('dummy label')
+
def test_page_gen(self, key) -> None:
"""Test Index page generator."""
data = self.sites[key]
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1197032?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I602e31dcb8f52017bc7651bd0034e15ff16e783b
Gerrit-Change-Number: 1197032
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1195406?usp=email )
Change subject: IMPR: Show the related site with NoUsernameError during LoginManager.login()
......................................................................
IMPR: Show the related site with NoUsernameError during LoginManager.login()
Change-Id: Iaeef4107a3707c2332860e7101f5cbc62b568ecd
---
M pywikibot/login.py
1 file changed, 3 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/pywikibot/login.py b/pywikibot/login.py
index 1dcb503..94650e9 100644
--- a/pywikibot/login.py
+++ b/pywikibot/login.py
@@ -153,9 +153,8 @@
if user['name'] != main_username:
# Report the same error as server error code NotExists
- raise NoUsernameError(
- f"Username '{main_username}' does not exist on {self.site}"
- )
+ msg = f"Username '{main_username}' does not exist on {self.site}"
+ raise NoUsernameError(msg)
def botAllowed(self) -> bool:
"""Check whether the bot is listed on a specific page.
@@ -322,7 +321,7 @@
if error_code in ('NotExists', 'Illegal', 'readapidenied',
'Failed', 'Aborted', 'FAIL'):
- error_msg = f'{e.code}: {e.info}'
+ error_msg = f'{e.code} on {self.site}: {e.info}'
raise NoUsernameError(error_msg)
pywikibot.error(f'Login failed ({error_code}).')
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1195406?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: Iaeef4107a3707c2332860e7101f5cbc62b568ecd
Gerrit-Change-Number: 1195406
Gerrit-PatchSet: 3
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot