jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/610731 )

Change subject: Revert "[bugfix] remove expectedFailure decorator of test_ecoreality" ......................................................................

Revert "[bugfix] remove expectedFailure decorator of test_ecoreality"

This reverts commit 1c4659c5b3fe3036949be10fa71c729ce2662c20.

Reason for revert: Temporary server issue, this patch broke the test

Change-Id: I99b4e44d0784e5147ed2431f6d0a602f33277762 --- M tests/site_detect_tests.py 1 file changed, 12 insertions(+), 3 deletions(-)

Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified

diff --git a/tests/site_detect_tests.py b/tests/site_detect_tests.py index bdabad2..0eab946 100644 --- a/tests/site_detect_tests.py +++ b/tests/site_detect_tests.py @@ -5,19 +5,25 @@ # # Distributed under the terms of the MIT license. # -from contextlib import suppress -from urllib.parse import urlparse + +from __future__ import absolute_import, division, unicode_literals

from requests.exceptions import ConnectionError, Timeout

import pywikibot from pywikibot.exceptions import ServerError from pywikibot.site_detect import MWSite +from pywikibot.tools import PY2

from tests import unittest_print from tests.aspects import unittest, TestCase, PatchingTestCase from tests.utils import DrySite

+if not PY2: + from urllib.parse import urlparse +else: + from urlparse import urlparse +

class SiteDetectionTestCase(TestCase):

@@ -155,6 +161,7 @@ """ self.assertNoSite('http://wikisophia.org/index.php?title=$1')

+ @unittest.expectedFailure def test_ecoreality(self): """Test detection of MediaWiki sites for www.EcoReality.org.

@@ -338,5 +345,7 @@

if __name__ == '__main__': # pragma: no cover - with suppress(SystemExit): + try: unittest.main() + except SystemExit: + pass