Magul has uploaded a new change for review.
https://gerrit.wikimedia.org/r/322963
Change subject: Fix of load_from_pageids' test case.
......................................................................
Fix of load_from_pageids' test case.
self.links cannot contain non-existing pages, because theirs pageids are 0,
which is ommited by load_from_pageids (and count != lenght of self.links).
Bug: T151378
Change-Id: Ie894f72180d5ac5d3fa151b38a4da0c0ed81674e
---
M tests/site_tests.py
1 file changed, 23 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/63/322963/1
diff --git a/tests/site_tests.py b/tests/site_tests.py
index 6134f26..5b2621e 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 = [
+ _ for _ in self.site.pagelinks(mainpage, total=10)
+ if _.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,22 +2492,22 @@
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):
"""Test loading with pageids is ordered."""
pageids = [page._pageid for page in self.links]
gen = self.site.load_pages_from_pageids(pageids)
- for page in gen:
+ for count, page in enumerate(gen, start=1):
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: newchange
Gerrit-Change-Id: Ie894f72180d5ac5d3fa151b38a4da0c0ed81674e
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Magul <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
