jenkins-bot has submitted this change and it was merged.
Change subject: [IMPROV] Tests: Do assertIn/assertNotIn if possible
......................................................................
[IMPROV] Tests: Do assertIn/assertNotIn if possible
Change-Id: Iac2349170f6c883717beadf59dfe591d0f188406
---
M tests/l10n_tests.py
M tests/site_tests.py
M tests/wikibase_edit_tests.py
3 files changed, 13 insertions(+), 10 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/l10n_tests.py b/tests/l10n_tests.py
index 46981a7..10e95b9 100644
--- a/tests/l10n_tests.py
+++ b/tests/l10n_tests.py
@@ -43,7 +43,7 @@
if template:
# check whether site is valid
site = pywikibot.Site('en', 'wikipedia')
- self.assertTrue(code in site.languages())
+ self.assertIn(code, site.languages())
# check whether template exists
title = template[0]
diff --git a/tests/site_tests.py b/tests/site_tests.py
index 86af273..b022919 100644
--- a/tests/site_tests.py
+++ b/tests/site_tests.py
@@ -359,7 +359,7 @@
gen = site._generator(pywikibot.data.api.PageGenerator,
type_arg='backlinks',
namespaces=None)
- self.assertTrue('gblnamespace' not in gen.request)
+ self.assertNotIn('gblnamespace', gen.request)
gen = site._generator(pywikibot.data.api.PageGenerator,
type_arg='backlinks',
namespaces=1)
@@ -400,7 +400,7 @@
self.assertIsInstance(ei, pywikibot.Page)
self.assertIn(ei, refs)
for ref in refs:
- self.assertTrue(ref in backlinks or ref in embedded)
+ self.assertIn(ref, backlinks | embedded)
# test embeddedin arguments
self.assertTrue(embedded.issuperset(
set(mysite.page_embeddedin(mainpage, filterRedirects=True,
@@ -625,7 +625,8 @@
self.assertTrue(user["name"].startswith("D"))
self.assertIn("editcount", user)
self.assertIn("registration", user)
- self.assertTrue("groups" in user and "sysop" in user["groups"])
+ self.assertIn('groups' in user)
+ self.assertIn('sysop' in user['groups'])
def testAllImages(self):
"""Test the site.allimages() method."""
@@ -980,7 +981,8 @@
end=pywikibot.Timestamp.fromISOformat("2008-02-03T00:00:01Z"), reverse=True,
total=5)
for change in mysite.recentchanges(namespaces=[6, 7], total=5):
self.assertIsInstance(change, dict)
- self.assertTrue("title" in change and "ns" in change)
+ self.assertIn('title', change)
+ self.assertIn('ns', change)
title = change['title']
self.assertIn(":", title)
prefix = title[:title.index(":")]
@@ -1179,7 +1181,8 @@
end="2008-09-03T00:00:01Z", reverse=True, total=5)
for rev in mysite.watchlist_revs(namespaces=[6, 7], total=5):
self.assertIsInstance(rev, dict)
- self.assertTrue("title" in rev and "ns" in rev)
+ self.assertIn('title', rev)
+ self.assertIn('ns', rev)
title = rev['title']
self.assertIn(":", title)
prefix = title[:title.index(":")]
@@ -1676,7 +1679,7 @@
def test_async_request(self):
self.assertTrue(page_put_queue.empty())
- self.assertTrue('statistics' not in self.site.siteinfo)
+ self.assertNotIn('statistics', self.site.siteinfo)
async_request(self.site.siteinfo.get, 'statistics')
page_put_queue.join()
self.assertIn('statistics', self.site.siteinfo)
diff --git a/tests/wikibase_edit_tests.py b/tests/wikibase_edit_tests.py
index 84dc056..30d2582 100644
--- a/tests/wikibase_edit_tests.py
+++ b/tests/wikibase_edit_tests.py
@@ -42,8 +42,8 @@
item.editLabels({'en': 'Test123'})
item.editLabels({'fa': 'Test123'})
item.get(force=True)
- self.assertTrue('en' in item.labels.keys())
- self.assertTrue('fa' in item.labels.keys())
+ self.assertIn('en', item.labels.keys())
+ self.assertIn('fa', item.labels.keys())
# This should remove the 'fa' label
item.editLabels({'en': 'Test123', 'fa': ''})
@@ -51,7 +51,7 @@
# Check 'fa' label is removed
item = pywikibot.ItemPage(testsite, 'Q68')
item.get()
- self.assertFalse('fa' in item.labels.keys())
+ self.assertNotIn('fa', item.labels.keys())
def test_alias_set(self):
testsite = self.get_repo()
--
To view, visit https://gerrit.wikimedia.org/r/219587
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iac2349170f6c883717beadf59dfe591d0f188406
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise <[email protected]>
Gerrit-Reviewer: John Vandenberg <[email protected]>
Gerrit-Reviewer: Ladsgroup <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
Pywikibot-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits
