jenkins-bot has submitted this change and it was merged.
Change subject: Fix load_pages_from_pageids' test case
......................................................................
Fix load_pages_from_pageids' test case
self.links cannot contain non-existing pages, because their pageids are 0,
which is omitted by load_pages_from_pageids (and count != length of self.links).
Bug: T151378
Change-Id: Ie894f72180d5ac5d3fa151b38a4da0c0ed81674e
---
M tests/site_tests.py
1 file changed, 22 insertions(+), 20 deletions(-)
Approvals:
Dalba: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/site_tests.py b/tests/site_tests.py
index 6134f26..4d84337 100644
--- a/tests/site_tests.py
+++ b/tests/site_tests.py
@@ -2468,8 +2468,10 @@
"""Setup tests."""
super(TestLoadPagesFromPageids, self).setUp()
self.site = self.get_site()
- mainpage = pywikibot.Page(pywikibot.Link('Main Page', self.site))
- self.links = list(self.site.pagelinks(mainpage, total=10))
+ mainpage = self.get_mainpage()
+ self.links = [
+ page for page in self.site.pagelinks(mainpage, total=10)
+ if page.exists()]
def test_load_from_pageids_iterable_of_str(self):
"""Test basic loading with pageids."""
@@ -2478,9 +2480,9 @@
for count, page in enumerate(gen, start=1):
self.assertIsInstance(page, pywikibot.Page)
self.assertIsInstance(page.exists(), bool)
- if page.exists():
- self.assertTrue(hasattr(page, '_pageid'))
- self.assertIn(page, self.links)
+ self.assertTrue(page.exists())
+ self.assertTrue(hasattr(page, '_pageid'))
+ self.assertIn(page, self.links)
self.assertEqual(count, len(self.links))
def test_load_from_pageids_iterable_of_int(self):
@@ -2490,9 +2492,9 @@
for count, page in enumerate(gen, start=1):
self.assertIsInstance(page, pywikibot.Page)
self.assertIsInstance(page.exists(), bool)
- if page.exists():
- self.assertTrue(hasattr(page, '_pageid'))
- self.assertIn(page, self.links)
+ self.assertTrue(page.exists())
+ self.assertTrue(hasattr(page, '_pageid'))
+ self.assertIn(page, self.links)
self.assertEqual(count, len(self.links))
def test_load_from_pageids_iterable_in_order(self):
@@ -2503,9 +2505,9 @@
link = self.links.pop(0)
self.assertIsInstance(page, pywikibot.Page)
self.assertIsInstance(page.exists(), bool)
- if page.exists():
- self.assertTrue(hasattr(page, '_pageid'))
- self.assertEqual(page, link)
+ self.assertTrue(page.exists())
+ self.assertTrue(hasattr(page, '_pageid'))
+ self.assertEqual(page, link)
def test_load_from_pageids_iterable_with_duplicate(self):
"""Test loading with duplicate pageids."""
@@ -2515,9 +2517,9 @@
for count, page in enumerate(gen, start=1):
self.assertIsInstance(page, pywikibot.Page)
self.assertIsInstance(page.exists(), bool)
- if page.exists():
- self.assertTrue(hasattr(page, '_pageid'))
- self.assertIn(page, self.links)
+ self.assertTrue(page.exists())
+ self.assertTrue(hasattr(page, '_pageid'))
+ self.assertIn(page, self.links)
self.assertEqual(count, len(self.links))
def test_load_from_pageids_comma_separated(self):
@@ -2527,9 +2529,9 @@
for count, page in enumerate(gen, start=1):
self.assertIsInstance(page, pywikibot.Page)
self.assertIsInstance(page.exists(), bool)
- if page.exists():
- self.assertTrue(hasattr(page, '_pageid'))
- self.assertIn(page, self.links)
+ self.assertTrue(page.exists())
+ self.assertTrue(hasattr(page, '_pageid'))
+ self.assertIn(page, self.links)
self.assertEqual(count, len(self.links))
def test_load_from_pageids_pipe_separated(self):
@@ -2539,9 +2541,9 @@
for count, page in enumerate(gen, start=1):
self.assertIsInstance(page, pywikibot.Page)
self.assertIsInstance(page.exists(), bool)
- if page.exists():
- self.assertTrue(hasattr(page, '_pageid'))
- self.assertIn(page, self.links)
+ self.assertTrue(page.exists())
+ self.assertTrue(hasattr(page, '_pageid'))
+ self.assertIn(page, self.links)
self.assertEqual(count, len(self.links))
--
To view, visit
https://gerrit.wikimedia.org/r/322963
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie894f72180d5ac5d3fa151b38a4da0c0ed81674e
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Magul <tomasz.magulski(a)gmail.com>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Lokal Profil <lokal.profil(a)gmail.com>
Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com>
Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot <>