jenkins-bot submitted this change.

View Change

[tests] skip superset_tests on ConnectionError

Also
- reorder imports
- login is already done because of login class attribute

Bug: T367939
Change-Id: If22af2fdafc0a4c006f7e0b0c9b10fc454e031cf
---
M tests/superset_tests.py
1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/tests/superset_tests.py b/tests/superset_tests.py
index 772fa05..171835f 100755
--- a/tests/superset_tests.py
+++ b/tests/superset_tests.py
@@ -9,11 +9,12 @@
 
 import unittest
 from contextlib import suppress
+
 import pywikibot
 from pywikibot.data.superset import SupersetQuery
 from pywikibot.exceptions import NoUsernameError
-from tests.aspects import TestCase
 from pywikibot.pagegenerators import SupersetPageGenerator
+from tests.aspects import TestCase
 
 
 class TestSupersetWithoutAuth(TestCase):
@@ -52,17 +53,17 @@
         """Superset login and queries."""
         sql = 'SELECT page_id, page_title FROM page LIMIT 2;'
         site = self.get_site()
-        site.login()
-        self.assertTrue(site.logged_in())
 
         # Test login and initial site parameters
+        superset = SupersetQuery(site=site)
         try:
-            superset = SupersetQuery(site=site)
             superset.login()
         except NoUsernameError:
-            pywikibot.warning('Oauth permission is missing. SKIPPING TESTS.')
-            return
+            self.skipTest('Oauth permission is missing.')
+        except ConnectionError as e:
+            self.skipTest(e)
 
+        self.assertTrue(site.logged_in())
         self.assertTrue(superset.connected)
         rows = superset.query(sql)
         self.assertLength(rows, 2)

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