[Pywikibot-commits] [Gerrit] pywikibot/core[master]: Handle disabled error during title search test

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/322974 ) Change subject: Handle disabled error during title search test ...................................................................... Handle disabled error during title search test Bug: T151376 Change-Id: I54af0634c4e699993067f5f769ea6eee3158a1f7 --- M tests/site_tests.py 1 file changed, 24 insertions(+), 8 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/site_tests.py b/tests/site_tests.py index 5b8e9e9..a504d44 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -1409,18 +1409,34 @@ raise unittest.SkipTest("gsrsearch returned timeout on site: %r" % e) raise - def test_search_where(self): - """Test the site.search() method with 'where' parameter.""" + def test_search_where_text(self): + """Test the site.search() method with 'where' parameter set to text.""" self.assertEqual(list(self.site.search('wiki', total=10)), - list(self.site.search('wiki', total=10, where='text'))) + list(self.site.search('wiki', total=10, + where='text'))) + + def test_search_where_nearmatch(self): + """Test the site.search(). + + 'where' parameter set to 'nearmatch'. + """ self.assertLessEqual(len(list(self.site.search('wiki', total=10, where='nearmatch'))), len(list(self.site.search('wiki', total=10)))) - for hit in self.site.search('wiki', namespaces=0, total=10, - get_redirects=True, where='title'): - self.assertIsInstance(hit, pywikibot.Page) - self.assertEqual(hit.namespace(), 0) - self.assertTrue('wiki' in hit.title().lower()) + + def test_search_where_title(self): + """Test site.search() method with 'where' parameter set to title.""" + try: + for hit in self.site.search('wiki', namespaces=0, total=10, + get_redirects=True, where='title'): + self.assertIsInstance(hit, pywikibot.Page) + self.assertEqual(hit.namespace(), 0) + self.assertTrue('wiki' in hit.title().lower()) + except pywikibot.data.api.APIError as e: + if e.code in ('search-title-disabled', 'gsrsearch-title-disabled'): + raise unittest.SkipTest( + 'Title search disabled on site: {0}'.format(self.site)) + raise class TestUserContribsAsUser(DefaultSiteTestCase): -- To view, visit https://gerrit.wikimedia.org/r/322974 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I54af0634c4e699993067f5f769ea6eee3158a1f7 Gerrit-PatchSet: 10 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Magul &lt;tomasz.magulski(a)gmail.com&gt; Gerrit-Reviewer: Dalba &lt;dalba.wiki(a)gmail.com&gt; Gerrit-Reviewer: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: Lokal Profil &lt;lokal.profil(a)gmail.com&gt; Gerrit-Reviewer: Magul &lt;tomasz.magulski(a)gmail.com&gt; Gerrit-Reviewer: Mpaa &lt;mpaa.wiki(a)gmail.com&gt; Gerrit-Reviewer: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: jenkins-bot <>