jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/407388 )
Change subject: [test] Skip test if Linter extension is missing ......................................................................
[test] Skip test if Linter extension is missing
Bug: T186000 Change-Id: I09c732b23005a163a401ef25511aaf23b32bbeb1 --- M tests/pagegenerators_tests.py M tests/site_tests.py 2 files changed, 14 insertions(+), 1 deletion(-)
Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified
diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 107a68d..43ca6ce 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -1179,6 +1179,9 @@
def test_linter_generator_ns_valid_cat(self): """Test generator of pages with lint errors.""" + if not self.site.has_extension('Linter'): + raise unittest.SkipTest( + 'The site {0} does not use Linter extension'.format(self.site)) gf = pagegenerators.GeneratorFactory(site=self.site) gf.handleArg('-ns:1') gf.handleArg('-limit:3') @@ -1194,6 +1197,9 @@
def test_linter_generator_invalid_cat(self): """Test generator of pages with lint errors.""" + if not self.site.has_extension('Linter'): + raise unittest.SkipTest( + 'The site {0} does not use Linter extension'.format(self.site)) gf = pagegenerators.GeneratorFactory(site=self.site) self.assertRaises(ValueError, gf.handleArg, '-linter:dummy')
diff --git a/tests/site_tests.py b/tests/site_tests.py index bd5ec92..e6d95f2 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Tests for the site module.""" # -# (C) Pywikibot team, 2008-2017 +# (C) Pywikibot team, 2008-2018 # # Distributed under the terms of the MIT license. # @@ -1069,6 +1069,13 @@
"""Test linter_pages methods."""
+ def setUp(self): + """Skip tests if Linter extension is missing.""" + super(TestLinterPages, self).setUpClass() + if not self.site.has_extension('Linter'): + raise unittest.SkipTest( + 'The site {0} does not use Linter extension'.format(self.site)) + def test_linter_pages(self): """Test the deprecated site.logpages() method.""" le = list(self.site.linter_pages(
pywikibot-commits@lists.wikimedia.org