jenkins-bot merged this change.

View Change

Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified
[tests] Use subTest to determine failing page

Bug: T237497
Change-Id: I7cde0e271a2b212de1957f3cc1ac19405ae32b82
---
M tests/site_tests.py
1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/tests/site_tests.py b/tests/site_tests.py
index ca4fc58..a1f7c36 100644
--- a/tests/site_tests.py
+++ b/tests/site_tests.py
@@ -3263,21 +3263,19 @@

def test_preload_langlinks_normal(self):
"""Test preloading continuation works."""
- # FIXME: test fails
mysite = self.get_site()
- mainpage = self.get_mainpage()
- count = 0
- links = mysite.pagelinks(mainpage, total=10)
- for page in mysite.preloadpages(links, groupsize=5, langlinks=True):
- 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'))
- self.assertTrue(hasattr(page, '_langlinks'))
- count += 1
- if count >= 6:
+ links = mysite.pagelinks(self.get_mainpage(), total=10)
+ gen = mysite.preloadpages(links, groupsize=5, langlinks=True)
+ for count, page in enumerate(gen):
+ with self.subTest(page=page.title()):
+ 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'))
+ self.assertTrue(hasattr(page, '_langlinks'))
+ if count >= 5:
break

@patch.object(pywikibot, 'output')
@@ -3302,20 +3300,19 @@
def test_preload_templates(self):
"""Test preloading templates works."""
mysite = self.get_site()
- mainpage = self.get_mainpage()
- count = 0
# Use backlinks, as any backlink has at least one link
- links = mysite.pagelinks(mainpage, total=10)
- for page in mysite.preloadpages(links, templates=True):
- 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'))
- self.assertTrue(hasattr(page, '_templates'))
- count += 1
- if count >= 6:
+ links = mysite.pagelinks(self.get_mainpage(), total=10)
+ gen = mysite.preloadpages(links, templates=True)
+ for count, page in enumerate(gen):
+ with self.subTest(page=page.title()):
+ 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'))
+ self.assertTrue(hasattr(page, '_templates'))
+ if count >= 5:
break

@unittest.expectedFailure

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

Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I7cde0e271a2b212de1957f3cc1ac19405ae32b82
Gerrit-Change-Number: 548957
Gerrit-PatchSet: 3
Gerrit-Owner: Xqt <info@gno.de>
Gerrit-Reviewer: Dvorapa <dvorapa@seznam.cz>
Gerrit-Reviewer: Mpaa <mpaa.wiki@gmail.com>
Gerrit-Reviewer: jenkins-bot (75)