John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181983
Change subject: Fix a few tests
......................................................................
Fix a few tests
Improve assertPagelistTitles to check that the generated list of titles
is the same length as the expected list.
Fix a pagegenerator test which used assertPagelistTitles with a string
for titles, which was split into characters, instead of a tuple of titles.
Improve the xmlreader asserts to be more precise.
Use lists of titles instead of tuples of titles for the reflinks xml
tests, as the use of preloading means the order can vary.
Change-Id: I00ceb32ac468b98f418d0fbe7ab1f0748e15b352
---
M tests/aspects.py
M tests/pagegenerators_tests.py
M tests/reflinks_tests.py
M tests/xmlreader_tests.py
4 files changed, 22 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/83/181983/1
diff --git a/tests/aspects.py b/tests/aspects.py
index 6915e39..ab36ed1 100644
--- a/tests/aspects.py
+++ b/tests/aspects.py
@@ -167,7 +167,9 @@
titles = tuple(titles)
if is_tuple:
- working_set = collections.deque(titles)
+ titles = collections.deque(titles)
+ else:
+ gen_titles = []
for page in gen:
self.assertIsInstance(page, pywikibot.Page)
@@ -177,12 +179,15 @@
title = page.title()
self.assertIn(title, titles)
if is_tuple:
- self.assertIn(title, working_set)
- self.assertEqual(title, working_set[0])
- working_set.popleft()
+ self.assertEqual(title, titles[0])
+ titles.popleft()
+ else:
+ gen_titles.append(title)
if is_tuple:
- self.assertEqual(working_set, collections.deque([]))
+ self.assertEqual(titles, collections.deque([]))
+ else:
+ self.assertEqual(len(gen_titles), len(titles))
class TestLoggingMixin(TestCaseBase):
diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py
index 31d0ec3..509830a 100755
--- a/tests/pagegenerators_tests.py
+++ b/tests/pagegenerators_tests.py
@@ -120,7 +120,7 @@
gen = pagegenerators.PagesFromTitlesGenerator(self.titles, self.site)
gen = pagegenerators.RegexFilterPageGenerator(gen, ['Template',
'/meta'],
quantifier='all')
- self.assertPagelistTitles(gen, ('Template:Template/Meta'))
+ self.assertPagelistTitles(gen, ('Template:Template/Meta', ))
gen = pagegenerators.PagesFromTitlesGenerator(self.titles, self.site)
gen = pagegenerators.RegexFilterPageGenerator(gen, ['template',
'/meta'],
quantifier='any')
diff --git a/tests/reflinks_tests.py b/tests/reflinks_tests.py
index d5dda0a..d4e62df 100644
--- a/tests/reflinks_tests.py
+++ b/tests/reflinks_tests.py
@@ -160,7 +160,7 @@
main('-xml:' + os.path.join(_xml_data_dir, 'dummy-reflinks.xml'))
gen = self.constructor_args[0]
pages = list(gen)
- self.assertPagelistTitles(pages, (u'Fake page', u'Talk:Fake page'),
+ self.assertPagelistTitles(pages, [u'Fake page', u'Talk:Fake page'],
site=self.get_site())
def test_xml_one_namespace(self):
@@ -168,7 +168,7 @@
'-namespace:1')
gen = self.constructor_args[0]
pages = list(gen)
- self.assertPagelistTitles(pages, (u'Talk:Fake page', ),
+ self.assertPagelistTitles(pages, [u'Talk:Fake page'],
site=self.get_site())
def test_xml_multiple_namespace_ids(self):
@@ -176,7 +176,7 @@
'-namespace:0', '-namespace:1', '-xmlstart:Fake page')
gen = self.constructor_args[0]
pages = list(gen)
- self.assertPagelistTitles(pages, (u'Fake page', u'Talk:Fake page'),
+ self.assertPagelistTitles(pages, [u'Fake page', u'Talk:Fake page'],
site=self.get_site())
@unittest.expectedFailure
@@ -185,7 +185,7 @@
'-namespace:0,1', '-xmlstart:Fake page')
gen = self.constructor_args[0]
pages = list(gen)
- self.assertPagelistTitles(pages, (u'Fake page', u'Talk:Fake page'),
+ self.assertPagelistTitles(pages, [u'Fake page', u'Talk:Fake page'],
site=self.get_site())
@unittest.expectedFailure
@@ -194,7 +194,7 @@
'-namespace:1', '-xmlstart:Fake')
gen = self.constructor_args[0]
pages = list(gen)
- self.assertPagelistTitles(pages, (u'Talk:Fake page', ),
+ self.assertPagelistTitles(pages, [u'Talk:Fake page'],
site=self.get_site())
@unittest.expectedFailure
@@ -203,7 +203,7 @@
'-namespace:1', '-xmlstart:Fake_page')
gen = self.constructor_args[0]
pages = list(gen)
- self.assertPagelistTitles(pages, (u'Talk:Fake page', ),
+ self.assertPagelistTitles(pages, [u'Talk:Fake page'],
site=self.get_site())
def test_xml_namespace_name(self):
@@ -211,7 +211,7 @@
'-namespace:Talk', '-xmlstart:Fake page')
gen = self.constructor_args[0]
pages = list(gen)
- self.assertPagelistTitles(pages, (u'Talk:Fake page', ),
+ self.assertPagelistTitles(pages, [u'Talk:Fake page'],
site=self.get_site())
diff --git a/tests/xmlreader_tests.py b/tests/xmlreader_tests.py
index 3681e19..1c7b55d 100644
--- a/tests/xmlreader_tests.py
+++ b/tests/xmlreader_tests.py
@@ -90,8 +90,6 @@
def test_pair(self):
entries = self._get_entries('pair-0.10.xml', allrevisions=True)
self.assertEqual(4, len(entries))
- self.assertTrue(all(entry.title.endswith(u"Çullu, Agdam")
- for entry in entries))
self.assertTrue(all(entry.username == 'Carlossuarez46'
for entry in entries))
self.assertTrue(all(entry.isredirect is False for entry in entries))
@@ -101,12 +99,16 @@
self.assertEqual(2, len(articles))
self.assertTrue(all(entry.id == "19252820" for entry in articles))
+ self.assertTrue(all(entry.title == u"Çullu, Agdam"
+ for entry in articles))
self.assertTrue(all(u'Çullu, Quzanlı' in entry.text
for entry in articles))
self.assertEqual(articles[0].text, u'#REDIRECT [[Çullu, Quzanlı]]')
self.assertEqual(2, len(talks))
self.assertTrue(all(entry.id == "19252824" for entry in talks))
+ self.assertTrue(all(entry.title == u"Talk:Çullu, Agdam"
+ for entry in talks))
self.assertEqual(talks[1].text, '{{DisambigProject}}')
self.assertEqual(talks[1].comment, 'proj')
--
To view, visit https://gerrit.wikimedia.org/r/181983
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I00ceb32ac468b98f418d0fbe7ab1f0748e15b352
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
