jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/840106 )
Change subject: [tests] Use self.site attribute instead of get_site() method without parameter ......................................................................
[tests] Use self.site attribute instead of get_site() method without parameter
Change-Id: Ifffcd7bfe429963e093c2aa4e0ffbbbd25c2b13d --- M tests/link_tests.py 1 file changed, 42 insertions(+), 42 deletions(-)
Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified
diff --git a/tests/link_tests.py b/tests/link_tests.py index e37c325..367bb96 100755 --- a/tests/link_tests.py +++ b/tests/link_tests.py @@ -99,7 +99,7 @@ ('A   B', 'A B'), ]
- site = self.get_site() + site = self.site
for title in self.replaced(title_tests): with self.subTest(title=title): @@ -200,22 +200,22 @@ else: regex = exception_regex with self.assertRaisesRegex(InvalidTitleError, regex): - Link(text, self.get_site()).parse() + Link(text, self.site).parse()
def test_relative(self): """Test that relative links are handled properly.""" # Subpage - page = Page(self.get_site(), 'Foo') + page = Page(self.site, 'Foo') rel_link = Link('/bar', page) self.assertEqual(rel_link.title, 'Foo/bar') - self.assertEqual(rel_link.site, self.get_site()) + self.assertEqual(rel_link.site, self.site) # Subpage of Page with section - page = Page(self.get_site(), 'Foo#Baz') + page = Page(self.site, 'Foo#Baz') rel_link = Link('/bar', page) self.assertEqual(rel_link.title, 'Foo/bar') - self.assertEqual(rel_link.site, self.get_site()) + self.assertEqual(rel_link.site, self.site) # Non-subpage link text beginning with slash - abs_link = Link('/bar', self.get_site()) + abs_link = Link('/bar', self.site) self.assertEqual(abs_link.title, '/bar')
@@ -261,7 +261,7 @@ """Test ':wikipedia:Main Page' on enwp is namespace 4.""" link = Link(':wikipedia:Main Page') link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'Main Page') self.assertEqual(link.namespace, 4)
@@ -269,7 +269,7 @@ """Test ':wikipedia:Talk:Main Page' on enwp is namespace 4.""" link = Link(':wikipedia:Talk:Main Page') link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'Talk:Main Page') self.assertEqual(link.namespace, 4)
@@ -277,7 +277,7 @@ """Test ':en:Main Page' on enwp is namespace 0.""" link = Link(':en:Main Page') link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'Main Page') self.assertEqual(link.namespace, 0)
@@ -285,7 +285,7 @@ """Test ':en:Talk:Main Page' on enwp is namespace 1.""" link = Link(':en:Talk:Main Page') link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'Main Page') self.assertEqual(link.namespace, 1)
@@ -298,7 +298,7 @@ """Test ':en:Main Page' on dewp is namespace 0.""" link = Link(':en:Main Page') link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'Main Page') self.assertEqual(link.namespace, 0)
@@ -306,7 +306,7 @@ """Test ':en:Talk:Main Page' on dewp is namespace 1.""" link = Link(':en:Talk:Main Page') link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'Main Page') self.assertEqual(link.namespace, 1)
@@ -328,7 +328,7 @@ """Test ':wikipedia:Main Page' on enws is namespace 0.""" link = Link(':wikipedia:Main Page') link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'Main Page') self.assertEqual(link.namespace, 0)
@@ -336,7 +336,7 @@ """Test ':wikipedia:Talk:Main Page' on enws is ns 1.""" link = Link(':wikipedia:Talk:Main Page') link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'Main Page') self.assertEqual(link.namespace, 1)
@@ -359,7 +359,7 @@
link = Link(':wikipedia:en:Talk:Main Page') link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'En:Talk:Main Page') self.assertEqual(link.namespace, 4)
@@ -372,7 +372,7 @@ """Test ':en:wikipedia:Main Page' on enwp is namespace 4.""" link = Link(':en:wikipedia:Main Page') link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'Main Page') self.assertEqual(link.namespace, 4)
@@ -380,7 +380,7 @@ """Test ':en:wikipedia:Talk:Main Page' on enwp is namespace 4.""" link = Link(':en:wikipedia:Talk:Main Page') link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'Talk:Main Page') self.assertEqual(link.namespace, 4)
@@ -555,7 +555,7 @@ """Test ':species:species:Main Page' on species is namespace 0.""" link = Link(':species:species:Main Page') link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'Main Page') self.assertEqual(link.namespace, 0)
@@ -563,7 +563,7 @@ """Test ':species:species:Talk:Main Page' on species is namespace 1.""" link = Link(':species:species:Talk:Main Page') link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'Main Page') self.assertEqual(link.namespace, 1)
@@ -579,7 +579,7 @@ """Test 'wikipedia:Main Page' on enwp is namespace 4.""" link = Link('wikipedia:Main Page') link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'Main Page') self.assertEqual(link.namespace, 4)
@@ -587,7 +587,7 @@ """Test 'wikipedia:Talk:Main Page' on enwp is namespace 4.""" link = Link('wikipedia:Talk:Main Page') link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'Talk:Main Page') self.assertEqual(link.namespace, 4)
@@ -595,7 +595,7 @@ """Test 'en:Main Page' on enwp is namespace 0.""" link = Link('en:Main Page') link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'Main Page') self.assertEqual(link.namespace, 0)
@@ -603,7 +603,7 @@ """Test 'en:Talk:Main Page' on enwp is namespace 1.""" link = Link('en:Talk:Main Page') link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'Main Page') self.assertEqual(link.namespace, 1)
@@ -616,7 +616,7 @@ """Test 'en:Main Page' on dewp is namespace 0.""" link = Link('en:Main Page') link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'Main Page') self.assertEqual(link.namespace, 0)
@@ -624,7 +624,7 @@ """Test 'en:Talk:Main Page' on dewp is namespace 1.""" link = Link('en:Talk:Main Page') link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'Main Page') self.assertEqual(link.namespace, 1)
@@ -646,7 +646,7 @@ """Test 'wikipedia:Main Page' on enws is namespace 0.""" link = Link('wikipedia:Main Page') link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'Main Page') self.assertEqual(link.namespace, 0)
@@ -654,7 +654,7 @@ """Test 'wikipedia:Talk:Main Page' on enws is ns 1.""" link = Link('wikipedia:Talk:Main Page') link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'Main Page') self.assertEqual(link.namespace, 1)
@@ -667,7 +667,7 @@ """Test 'en:wikipedia:Main Page' on enwp is namespace 4.""" link = Link('en:wikipedia:Main Page') link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'Main Page') self.assertEqual(link.namespace, 4)
@@ -675,7 +675,7 @@ """Test 'en:wikipedia:Talk:Main Page' on enwp is namespace 4.""" link = Link('en:wikipedia:Talk:Main Page') link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'Talk:Main Page') self.assertEqual(link.namespace, 4)
@@ -781,7 +781,7 @@ """Test 'species:species:Main Page' on enwp is namespace 0.""" link = Link('species:species:Main Page') link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'Main Page') self.assertEqual(link.namespace, 0)
@@ -789,7 +789,7 @@ """Test 'species:species:Talk:Main Page' on enwp is namespace 1.""" link = Link('species:species:Talk:Main Page') link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'Main Page') self.assertEqual(link.namespace, 1)
@@ -797,7 +797,7 @@ """Test 'species:Main Page' on enwp is namespace 0.""" link = Link('species:Main Page') link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'Main Page') self.assertEqual(link.namespace, 0)
@@ -805,7 +805,7 @@ """Test 'species:Talk:Main Page' on enwp is namespace 1.""" link = Link('species:Talk:Main Page') link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'Main Page') self.assertEqual(link.namespace, 1)
@@ -819,15 +819,15 @@
def test_interwiki_mainpage(self): """Test that Link allow links without a title to the main page.""" - link = Link('en:', self.get_site()) + link = Link('en:', self.site) link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, '') self.assertEqual(link.namespace, 0)
def test_interwiki_namespace_without_title(self): """Test that Link doesn't allow links without a title.""" - link = Link('en:Help:', self.get_site()) + link = Link('en:Help:', self.site) with self.assertRaisesRegex( InvalidTitleError, "'en:Help:' has no title."): @@ -835,7 +835,7 @@
def test_no_text(self): """Test that Link doesn't allow empty.""" - link = Link('', self.get_site()) + link = Link('', self.site) with self.assertRaisesRegex( InvalidTitleError, r'The link [[.*]] does not contain a page title'): @@ -843,15 +843,15 @@
def test_namespace_lookalike(self): """Test that Link does only detect valid namespaces.""" - link = Link('CAT:', self.get_site()) + link = Link('CAT:', self.site) link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'CAT:') self.assertEqual(link.namespace, 0)
- link = Link('en:CAT:', self.get_site()) + link = Link('en:CAT:', self.site) link.parse() - self.assertEqual(link.site, self.get_site()) + self.assertEqual(link.site, self.site) self.assertEqual(link.title, 'CAT:') self.assertEqual(link.namespace, 0)
pywikibot-commits@lists.wikimedia.org