jenkins-bot has submitted this change and it was merged. Change subject: Allow RC tests to be skipped on any site ...................................................................... Allow RC tests to be skipped on any site Restore fr.wiktionary builds, without RC tests, as ar.wiktionary has not triggered T92856. Change-Id: Ibb465a4280e97d6f0569b5da788ad1d019fd0d4a --- M .travis.yml M tests/aspects.py M tests/pagegenerators_tests.py 3 files changed, 25 insertions(+), 25 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/.travis.yml b/.travis.yml index fc28d39..5123197 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,7 +79,7 @@ - secure: kofInMlisiTBt9o/Ustc/vySlkKfxGzGCX2LwA1D2waym8sDTS0o5gMJ5LsrT/BUKwZbe1vLozPHqZrrkQvsdTml+DpZuotzdILs0m0f3BUoexEC6OON5IDljuxFyETrD1Ug44ih5Mc4lVFOdTcBzg501ZmswGwQrBvg/OyEFfE= matrix: - LANGUAGE=en FAMILY=wikipedia EXTERNALS_HTTPLIB2=1 PYWIKIBOT2_TEST_PROD_ONLY=1 - - LANGUAGE=fr FAMILY=wikipedia PYSETUP_TEST_EXTRAS=1 PYWIKIBOT2_TEST_PROD_ONLY=1 + - LANGUAGE=fr FAMILY=wiktionary PYSETUP_TEST_EXTRAS=1 PYWIKIBOT2_TEST_PROD_ONLY=1 PYWIKIBOT2_TEST_NO_RC=1 - LANGUAGE=wikidata FAMILY=wikidata SITE_ONLY=1 - LANGUAGE=ar FAMILY=wiktionary SITE_ONLY=1 EXTERNALS_HTTPLIB2=1 diff --git a/tests/aspects.py b/tests/aspects.py index 0af24b4..c0a241c 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -1186,6 +1186,26 @@ return execute_pwb(args, data_in, timeout, error) +class RecentChangesTestCase(WikimediaDefaultSiteTestCase): + + """Test cases for tests that use recent change.""" + + # site.recentchanges() includes external edits from wikidata, + # except on wiktionaries which are not linked to wikidata + # so total=3 should not be too high for most sites. + length = 3 + + @classmethod + def setUpClass(cls): + if os.environ.get('PYWIKIBOT2_TEST_NO_RC', '0') == '1': + raise unittest.SkipTest('RecentChanges tests disabled.') + + super(RecentChangesTestCase, cls).setUpClass() + + if cls.get_site().code == 'test': + cls.override_default_site(pywikibot.Site('en', 'wikipedia')) + + class DebugOnlyTestCase(TestCase): """Test cases that only operate in debug mode.""" diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index b76c955..967b95e 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -30,7 +30,7 @@ DeprecationTestCase, WikidataTestCase, DefaultSiteTestCase, - WikimediaDefaultSiteTestCase, + RecentChangesTestCase, ) from tests.thread_tests import GeneratorIntersectTestCase @@ -232,21 +232,9 @@ self.assertEqual(len(list(gen)), 0) -class TestRepeatingGenerator(WikimediaDefaultSiteTestCase): +class TestRepeatingGenerator(RecentChangesTestCase): """Test RepeatingGenerator.""" - - # site.recentchanges() includes external edits from wikidata, - # except on wiktionaries which are not linked to wikidata - # so total=3 should not be too high for most sites. - length = 3 - - @classmethod - def setUpClass(cls): - super(TestRepeatingGenerator, cls).setUpClass() - - if cls.get_site().code == 'test': - cls.override_default_site(pywikibot.Site('en', 'wikipedia')) def test_RepeatingGenerator(self): items = list( @@ -835,14 +823,9 @@ ) -class LiveRCPageGeneratorTestCase(WikimediaDefaultSiteTestCase): +class LiveRCPageGeneratorTestCase(RecentChangesTestCase): - """Test case for Live Recent Changes pagegenerator. - - Works best on a busy site, as three changes are requested - """ - - length = 3 + """Test case for Live Recent Changes pagegenerator.""" @classmethod def setUpClass(cls): @@ -856,9 +839,6 @@ raise unittest.SkipTest( 'socketIO_client %s not supported by Wikimedia-Stream' % socketIO_client.__version__) - - if cls.get_site().code == 'test': - cls.override_default_site(pywikibot.Site('en', 'wikipedia')) def test_RC_pagegenerator_result(self): import logging -- To view, visit https://gerrit.wikimedia.org/r/208916 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibb465a4280e97d6f0569b5da788ad1d019fd0d4a Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: Ladsgroup &lt;ladsgroup(a)gmail.com&gt; Gerrit-Reviewer: Merlijn van Deen &lt;valhallasw(a)arctus.nl&gt; Gerrit-Reviewer: XZise &lt;CommodoreFabianus(a)gmx.de&gt; Gerrit-Reviewer: jenkins-bot <>