jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/509633 )
Change subject: [tests] remove allowed_failure/allowed_failure_if from site_tests.py
......................................................................
[tests] remove allowed_failure/allowed_failure_if from site_tests.py
- test_image_usage_in_redirects: no reason given why this test should
not run at travis
- test_preload_langlinks_normal passes
- remove deactivated test _test_preload_langlinks_long because
it needs 20' to pass and the test is already done in
test_preload_langlinks_normal
- test_preload_template passes
- test_preload_templates_and_langlinks fails due to unknown reason;
mark it with unittest.expectedFailure decorator
Bug: T223030
Change-Id: I32f8b18b87954589faa8a722f99e4d819ea47442
---
M tests/site_tests.py
1 file changed, 2 insertions(+), 26 deletions(-)
Approvals:
Dvorapa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/site_tests.py b/tests/site_tests.py
index c7ff572..ca4fc58 100644
--- a/tests/site_tests.py
+++ b/tests/site_tests.py
@@ -7,7 +7,6 @@
#
from __future__ import absolute_import, division, unicode_literals
-import os
import pickle
import random
import re
@@ -46,7 +45,7 @@
AlteredDefaultSiteTestCase,
)
from tests.basepage_tests import BasePageLoadRevisionsCachingTestBase
-from tests.utils import allowed_failure, allowed_failure_if, entered_loop
+from tests.utils import entered_loop
if not PY2:
long = int # Must be global: T159700
@@ -1264,7 +1263,6 @@
self.assertIsInstance(using, pywikibot.Page)
self.assertIn(imagepage, list(using.imagelinks()))
- @allowed_failure_if(os.environ.get('TRAVIS', 'false') ==
'true')
def test_image_usage_in_redirects(self):
"""Test the site.imageusage() method on redirects
only."""
mysite = self.get_site()
@@ -3263,7 +3261,6 @@
if count > 5:
break
- @allowed_failure
def test_preload_langlinks_normal(self):
"""Test preloading continuation works."""
# FIXME: test fails
@@ -3302,28 +3299,6 @@
self.assertRegex(
output_mock.call_args[0][0], r'Retrieving \d pages from ')
- def _test_preload_langlinks_long(self):
- """Test preloading continuation works."""
- # FIXME: test fails. It is disabled as it takes more
- # than 10 minutes on travis for English Wikipedia
- mysite = self.get_site()
- mainpage = self.get_mainpage()
- count = 0
- links = mainpage.backlinks(total=100)
- for page in mysite.preloadpages(links, groupsize=50,
- langlinks=True):
- self.assertIsInstance(page, pywikibot.Page)
- self.assertIsInstance(page.exists(), bool)
- if page.exists():
- self.assertLength(page._revisions, 1)
- self.assertIsNotNone(page._revisions[page._revid].text)
- self.assertFalse(hasattr(page, '_pageprops'))
- self.assertTrue(hasattr(page, '_langlinks'))
- count += 1
-
- self.assertLength(links, count)
-
- @allowed_failure
def test_preload_templates(self):
"""Test preloading templates works."""
mysite = self.get_site()
@@ -3343,6 +3318,7 @@
if count >= 6:
break
+ @unittest.expectedFailure
def test_preload_templates_and_langlinks(self):
"""Test preloading templates and langlinks
works."""
mysite = self.get_site()
--
To view, visit
https://gerrit.wikimedia.org/r/509633
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I32f8b18b87954589faa8a722f99e4d819ea47442
Gerrit-Change-Number: 509633
Gerrit-PatchSet: 3
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: jenkins-bot (75)