jenkins-bot merged this change.

View Change

[bugfix] Fix errors produced by clientlogin

- clientlogin has different set of responses from login, which makes
  several assertions fail

Change-Id: I41bdd6020cd32d22e15610e5973ec0a62683bc6a
---
M pywikibot/login.py
M tests/api_tests.py
2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pywikibot/login.py b/pywikibot/login.py
index ef65e03..1b32a48 100644
--- a/pywikibot/login.py
+++ b/pywikibot/login.py
@@ -262,6 +262,7 @@
         'Illegal': 'is invalid',
         'readapidenied': 'does not have read permissions',
         'Failed': 'does not have read permissions',
+        'FAIL': 'does not have read permissions',
     }
 
     def login(self, retry=False, autocreate=False):
@@ -303,7 +304,7 @@
             if error_code in self._api_error:
                 error_msg = 'Username "{}" {} on {}'.format(
                     self.login_name, self._api_error[error_code], self.site)
-                if error_code == 'Failed':
+                if error_code in ('Failed', 'FAIL'):
                     error_msg += '\n.{}'.format(e.info)
                 raise NoUsername(error_msg)
 
diff --git a/tests/api_tests.py b/tests/api_tests.py
index 11a2dc1..bd3b310 100644
--- a/tests/api_tests.py
+++ b/tests/api_tests.py
@@ -1026,7 +1026,10 @@
         try:
             error.assert_called_with('Login failed (readapidenied).')
         except AssertionError:  # MW version is older than 1.34.0-wmf.13
-            error.assert_called_with('Login failed (Failed).')
+            try:
+                error.assert_called_with('Login failed (FAIL).')
+            except AssertionError:  # MW version is older than 1.27
+                error.assert_called_with('Login failed (Failed).')
         warning.assert_called_with(
             'API error readapidenied: '
             'You need read permission to use this module.')

To view, visit change 584094. To unsubscribe, or for help writing mail filters, visit settings.