jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/763888 )
Change subject: [IMPR] Replace int counter with enumerate
......................................................................
[IMPR] Replace int counter with enumerate
Change-Id: I428932d6f20f9d32e59d933f92a2a6e9475a5e1e
---
M tests/site_tests.py
1 file changed, 11 insertions(+), 23 deletions(-)
Approvals:
Matěj Suchánek: Looks good to me, but someone else must approve
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/site_tests.py b/tests/site_tests.py
index c9973ad..443b563 100644
--- a/tests/site_tests.py
+++ b/tests/site_tests.py
@@ -2938,11 +2938,10 @@
"""Test basic preloading with pageids."""
mysite = self.get_site()
mainpage = self.get_mainpage()
- count = 0
links = mysite.pagelinks(mainpage, total=10)
# preloadpages will send the page ids,
# as they have already been loaded by pagelinks
- for page in mysite.preloadpages(links):
+ for count, page in enumerate(mysite.preloadpages(links), start=1):
self.assertIsInstance(page, pywikibot.Page)
self.assertIsInstance(page.exists(), bool)
if page.exists():
@@ -2951,7 +2950,6 @@
self.assertIn(page._revid, page._revisions)
self.assertIsNotNone(page._revisions[page._revid].text)
self.assertFalse(hasattr(page, '_pageprops'))
- count += 1
if count >= 5:
break
@@ -2959,7 +2957,6 @@
"""Test basic preloading with titles."""
mysite = self.get_site()
mainpage = self.get_mainpage()
- count = 0
links = mysite.pagelinks(mainpage, total=10)
# remove the pageids that have already been loaded above by pagelinks
@@ -2969,14 +2966,13 @@
self.assertEqual(page.pageid, page._pageid)
del page._pageid
- for page in mysite.preloadpages(links):
+ for count, page in enumerate(mysite.preloadpages(links), start=1):
self.assertIsInstance(page, pywikibot.Page)
self.assertIsInstance(page.exists(), bool)
if page.exists():
self.assertLength(page._revisions, 1)
self.assertIsNotNone(page._revisions[page._revid].text)
self.assertFalse(hasattr(page, '_pageprops'))
- count += 1
if count >= 5:
break
@@ -2984,17 +2980,15 @@
"""Test preloading continuation works."""
mysite = self.get_site()
mainpage = self.get_mainpage()
- count = 0
links = mysite.pagelinks(mainpage, total=10)
- for page in mysite.preloadpages(links, groupsize=5):
+ for count, page in enumerate(mysite.preloadpages(links, groupsize=5)):
self.assertIsInstance(page, pywikibot.Page)
self.assertIsInstance(page.exists(), bool)
if page.exists():
self.assertLength(page._revisions, 1)
self.assertIsNotNone(page._revisions[page._revid].text)
self.assertFalse(hasattr(page, '_pageprops'))
- count += 1
- if count >= 6:
+ if count >= 5:
break
def test_preload_high_groupsize(self):
@@ -3051,7 +3045,6 @@
"""Test sending pageids with unnormalized titles, causing warnings."""
mysite = self.get_site()
mainpage = self.get_mainpage()
- count = 0
links = list(mysite.pagelinks(mainpage, total=10))
if len(links) < 2:
self.skipTest('insufficient links on main page')
@@ -3065,22 +3058,20 @@
page._link._text += ' '
gen = mysite.preloadpages(links, groupsize=5)
- for page in gen:
+ for count, page in enumerate(gen):
self.assertIsInstance(page, pywikibot.Page)
self.assertIsInstance(page.exists(), bool)
if page.exists():
self.assertLength(page._revisions, 1)
self.assertIsNotNone(page._revisions[page._revid].text)
self.assertFalse(hasattr(page, '_pageprops'))
- count += 1
- if count > 5:
+ if count >= 5:
break
def test_preload_unexpected_titles_using_titles(self):
"""Test sending unnormalized titles, causing warnings."""
mysite = self.get_site()
mainpage = self.get_mainpage()
- count = 0
links = list(mysite.pagelinks(mainpage, total=10))
if len(links) < 2:
self.skipTest('insufficient links on main page')
@@ -3094,22 +3085,20 @@
del page._pageid
gen = mysite.preloadpages(links, groupsize=5)
- for page in gen:
+ for count, page in enumerate(gen):
self.assertIsInstance(page, pywikibot.Page)
self.assertIsInstance(page.exists(), bool)
if page.exists():
self.assertLength(page._revisions, 1)
self.assertIsNotNone(page._revisions[page._revid].text)
self.assertFalse(hasattr(page, '_pageprops'))
- count += 1
- if count > 5:
+ if count >= 5:
break
def test_preload_invalid_titles_without_pageids(self):
"""Test sending invalid titles. No warnings issued, but it should."""
mysite = self.get_site()
mainpage = self.get_mainpage()
- count = 0
links = list(mysite.pagelinks(mainpage, total=10))
if len(links) < 2:
self.skipTest('insufficient links on main page')
@@ -3119,12 +3108,11 @@
del page._pageid
gen = mysite.preloadpages(links, groupsize=5)
- for page in gen:
+ for count, page in enumerate(gen):
self.assertIsInstance(page, pywikibot.Page)
self.assertIsInstance(page.exists(), bool)
- self.assertFalse(page.exists())
- count += 1
- if count > 5:
+ self.assertFalse(page.exists(), 'page {} exists'.format(page))
+ if count >= 5:
break
def test_preload_langlinks_normal(self):
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/763888
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I428932d6f20f9d32e59d933f92a2a6e9475a5e1e
Gerrit-Change-Number: 763888
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: Matěj Suchánek <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
_______________________________________________
Pywikibot-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
