jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/762057 )
Change subject: [tests] move TestClearCookies to site_login_logout_tests.py ......................................................................
[tests] move TestClearCookies to site_login_logout_tests.py
TestClearCookies uses logout() method and should not run in parallel with other CI tests.
Change-Id: I730845205a9f44a6c1dd6015d76e22bd1ca74a03 --- M tests/site_login_logout_tests.py M tests/site_tests.py 2 files changed, 32 insertions(+), 27 deletions(-)
Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified
diff --git a/tests/site_login_logout_tests.py b/tests/site_login_logout_tests.py index d53ff30..751b243 100644 --- a/tests/site_login_logout_tests.py +++ b/tests/site_login_logout_tests.py @@ -1,5 +1,10 @@ #!/usr/bin/python3 -"""Test for login and logout methods.""" +"""Test for login and logout methods. + +These tests are separated from others because they should not be runned +in paralled CI test tasks. Any logout could lead other parallel tests +to fail. +""" # # (C) Pywikibot team, 2022 # @@ -12,7 +17,7 @@ import pywikibot from pywikibot.exceptions import APIError
-from tests.aspects import DefaultSiteTestCase +from tests.aspects import DefaultSiteTestCase, TestCase
class TestLoginLogout(DefaultSiteTestCase): @@ -51,10 +56,34 @@ self.assertIsNone(site.user())
+class TestClearCookies(TestCase): + """Test cookies are cleared after logout.""" + + login = True + + family = 'wikisource' + code = 'zh' + + def test_clear_cookies(self): + """Test cookies are cleared (T224712).""" + site = self.get_site() + site.login() + site2 = pywikibot.Site('mul', 'wikisource', user=site.username()) + site2.login() + site.logout() + + raised = False + try: + site.login() + except Exception as e: + raised = e + self.assertFalse(raised) + + def setUpModule(): # noqa: N802 """Skip tests if PYWIKIBOT_LOGIN_LOGOUT variable is not set.""" if os.environ.get('PYWIKIBOT_LOGIN_LOGOUT', '0') != '1': - raise unittest.SkipTest('login/logout tests ar disabled') + raise unittest.SkipTest('login/logout tests are disabled')
if __name__ == '__main__': # pragma: no cover diff --git a/tests/site_tests.py b/tests/site_tests.py index faf457c..de1bde2 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -3568,30 +3568,6 @@ self.assertIsNone(page)
-class TestClearCookies(TestCase): - """Test cookies are cleared after logout.""" - - login = True - - family = 'wikisource' - code = 'zh' - - def test_clear_cookies(self): - """Test cookies are cleared (T224712).""" - site = self.get_site() - site.login() - site2 = pywikibot.Site('mul', 'wikisource', user=site.username()) - site2.login() - site.logout() - - raised = False - try: - site.login() - except Exception as e: - raised = e - self.assertFalse(raised) - - if __name__ == '__main__': # pragma: no cover with suppress(SystemExit): unittest.main()
pywikibot-commits@lists.wikimedia.org