John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234845
Change subject: Skip sites that timeout
......................................................................
Skip sites that timeout
Change-Id: I2e7cc972f262b281e65f56cf48c4ecd8148d1f4f
---
M tests/site_detect_tests.py
1 file changed, 11 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/45/234845/1
diff --git a/tests/site_detect_tests.py b/tests/site_detect_tests.py
index f88c128..9e5e168 100644
--- a/tests/site_detect_tests.py
+++ b/tests/site_detect_tests.py
@@ -9,6 +9,8 @@
__version__ = '$Id$'
+import socket
+
from pywikibot.site_detect import MWSite
from pywikibot.tools import PY2
@@ -28,6 +30,7 @@
def setUp(self):
"""Set up test."""
+ self.skips = {}
self.failures = {}
self.errors = {}
self.passes = {}
@@ -40,7 +43,7 @@
res = None
typ = -1
for pos, result in enumerate([self.passes, self.errors,
- self.failures]):
+ self.failures, self.skips]):
if url in result:
assert res is None
res = result[url]
@@ -52,10 +55,10 @@
return typ, url, res
super(TestWikiSiteDetection, self).tearDown()
- print('Out of %d sites, %d tests passed, %d tests failed '
- 'and %d tests raised an error'
+ print('Out of %d sites, %d tests passed, %d tests failed, '
+ '%d tests skiped and %d tests raised an error'
% (len(self.all), len(self.passes), len(self.failures),
- len(self.errors))
+ len(self.skips), len(self.errors))
)
PREFIXES = ['PASS', 'ERR ', 'FAIL', 'MISS']
@@ -72,6 +75,9 @@
self.all += [url]
try:
site = MWSite(url)
+ except socket.error as e:
+ self.skips[url] = e
+ return
except Exception as e:
print('failed on ' + url)
self.errors[url] = e
@@ -137,7 +143,7 @@
self.assertSite('http://www.EcoReality.org/wiki/$1')
self.assertSite('http://www.wikichristian.org/index.php?title=$1')
self.assertSite('http://wikitree.org/index.php?title=$1')
- self.assertEqual(len(self.passes), 12)
+ self.assertEqual(len(self.passes), 12-len(self.skips))
self.assertEqual(len(self.failures), 0)
self.assertEqual(len(self.errors), 0)
--
To view, visit https://gerrit.wikimedia.org/r/234845
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e7cc972f262b281e65f56cf48c4ecd8148d1f4f
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <jay...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
