Merge "[TEST] Test solution for T134640" into nexqt

wikimedia · May 7, 2016 · 3ed0954 · 3ed0954
2 parents 524dc98 + 93cae22
commit 3ed0954
Showing 1 changed file with 60 additions and 39 deletions.
diff --git a/tests/site_tests.py b/tests/site_tests.py
@@ -24,6 +24,7 @@
 
 from pywikibot.comms import http
 from pywikibot.data import api
+from pywikibot.data.api import TimeoutError
 
 from pywikibot import async_request, page_put_queue
 from pywikibot.tools import (
@@ -937,7 +938,7 @@ def test_protectedpages_edit_level(self):
             if list(site.protectedpages(type='edit', level=level, total=1)):
                 levels.add(level)
         if not levels:
-            raise unittest.SkipTest('The site "{0}" has no protected pages in '
+            raise unittest.skipTest('The site "{0}" has no protected pages in '
                                     'main namespace.'.format(site))
         # select one level which won't yield all pages from above
         level = next(iter(levels))
@@ -1475,48 +1476,68 @@ def test_user_prefix(self):
     def test_user_prefix_range(self):
         """Test the site.usercontribs() method."""
         mysite = self.get_site()
-        for contrib in mysite.usercontribs(
-                userprefix='Jane',
-                start=pywikibot.Timestamp.fromISOformat("2008-10-06T01:02:03Z"),
-                total=5):
-            self.assertLessEqual(contrib['timestamp'], "2008-10-06T01:02:03Z")
-
-        for contrib in mysite.usercontribs(
-                userprefix='Jane',
-                end=pywikibot.Timestamp.fromISOformat("2008-10-07T02:03:04Z"),
-                total=5):
-            self.assertGreaterEqual(contrib['timestamp'], "2008-10-07T02:03:04Z")
-
-        for contrib in mysite.usercontribs(
-                userprefix='Tim',
-                start=pywikibot.Timestamp.fromISOformat("2008-10-10T11:59:59Z"),
-                end=pywikibot.Timestamp.fromISOformat("2008-10-10T00:00:01Z"),
-                total=5):
-            self.assertTrue(
-                "2008-10-10T00:00:01Z" <= contrib['timestamp'] <= "2008-10-10T11:59:59Z")
+        try:
+            for contrib in mysite.usercontribs(
+                    userprefix='Jane',
+                    start=pywikibot.Timestamp.fromISOformat(
+                        '2008-10-06T01:02:03Z'),
+                    total=5):
+                self.assertLessEqual(contrib['timestamp'],
+                                     '2008-10-06T01:02:03Z')
+
+            for contrib in mysite.usercontribs(
+                    userprefix='Jane',
+                    end=pywikibot.Timestamp.fromISOformat(
+                        '2008-10-07T02:03:04Z'),
+                    total=5):
+                self.assertGreaterEqual(contrib['timestamp'],
+                                        '2008-10-07T02:03:04Z')
+
+            for contrib in mysite.usercontribs(
+                    userprefix='Tim',
+                    start=pywikibot.Timestamp.fromISOformat(
+                        '2008-10-10T11:59:59Z'),
+                    end=pywikibot.Timestamp.fromISOformat(
+                        '2008-10-10T00:00:01Z'),
+                    total=5):
+                self.assertTrue(
+                    '2008-10-10T00:00:01Z' <= contrib['timestamp'] <=
+                    '2008-10-10T11:59:59Z')
+        except TimeoutError as e:
+            raise unittest.skipTest(e)
 
     def test_user_prefix_reverse(self):
         """Test the site.usercontribs() method with range reversed."""
         mysite = self.get_site()
-        for contrib in mysite.usercontribs(
-                userprefix='Brion',
-                start=pywikibot.Timestamp.fromISOformat("2008-10-08T03:05:07Z"),
-                total=5, reverse=True):
-            self.assertGreaterEqual(contrib['timestamp'], "2008-10-08T03:05:07Z")
-
-        for contrib in mysite.usercontribs(
-                userprefix='Brion',
-                end=pywikibot.Timestamp.fromISOformat("2008-10-09T04:06:08Z"),
-                total=5, reverse=True):
-            self.assertLessEqual(contrib['timestamp'], "2008-10-09T04:06:08Z")
-
-        for contrib in mysite.usercontribs(
-                userprefix='Tim',
-                start=pywikibot.Timestamp.fromISOformat("2008-10-11T06:00:01Z"),
-                end=pywikibot.Timestamp.fromISOformat("2008-10-11T23:59:59Z"),
-                reverse=True, total=5):
-            self.assertTrue(
-                "2008-10-11T06:00:01Z" <= contrib['timestamp'] <= "2008-10-11T23:59:59Z")
+        try:
+            for contrib in mysite.usercontribs(
+                    userprefix='Brion',
+                    start=pywikibot.Timestamp.fromISOformat(
+                        '2008-10-08T03:05:07Z'),
+                    total=5, reverse=True):
+                self.assertGreaterEqual(contrib['timestamp'],
+                                        '2008-10-08T03:05:07Z')
+
+            for contrib in mysite.usercontribs(
+                    userprefix='Brion',
+                    end=pywikibot.Timestamp.fromISOformat(
+                        '2008-10-09T04:06:08Z'),
+                    total=5, reverse=True):
+                self.assertLessEqual(contrib['timestamp'],
+                                     '2008-10-09T04:06:08Z')
+
+            for contrib in mysite.usercontribs(
+                    userprefix='Tim',
+                    start=pywikibot.Timestamp.fromISOformat(
+                        '2008-10-11T06:00:01Z'),
+                    end=pywikibot.Timestamp.fromISOformat(
+                        '2008-10-11T23:59:59Z'),
+                    reverse=True, total=5):
+                self.assertTrue(
+                    '2008-10-11T06:00:01Z' <= contrib['timestamp'] <=
+                    '2008-10-11T23:59:59Z')
+        except TimeoutError as e:
+            raise unittest.skipTest(e)
 
     def test_invalid_range(self):
         """Test the site.usercontribs() method with invalid parameters."""