From: Berker Peksag Date: Wed, 8 Apr 2015 08:24:27 +0000 (+0300) Subject: Skip nntplib tests when transient errors captured. X-Git-Tag: v3.5.0a4~140^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52c0c3382d95a8a4877a5dfaaacf61b436f0b1bf;p=thirdparty%2FPython%2Fcpython.git Skip nntplib tests when transient errors captured. --- diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index 1ec3178beafc..01ca2f8c777a 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -13,6 +13,7 @@ import gc import importlib import importlib.util import logging.handlers +import nntplib import os import platform import re @@ -1340,6 +1341,10 @@ def transient_internet(resource_name, *, timeout=30.0, errnos=()): if timeout is not None: socket.setdefaulttimeout(timeout) yield + except nntplib.NNTPTemporaryError as err: + if verbose: + sys.stderr.write(denied.args[0] + "\n") + raise denied from err except OSError as err: # urllib can wrap original socket errors multiple times (!), we must # unwrap to get at the original error.