From e575148cc23283f72aeeb0bff4a9343ce738aa92 Mon Sep 17 00:00:00 2001 From: "doko@ubuntu.com" Date: Thu, 26 Dec 2013 17:37:11 +0100 Subject: [PATCH] - Issue #20070: Don't run test_urllib2net when network resources are not enabled. --- Lib/test/test_urllib2net.py | 3 ++- Misc/NEWS | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py index fba3ceac83f..ab638eae2fb 100644 --- a/Lib/test/test_urllib2net.py +++ b/Lib/test/test_urllib2net.py @@ -14,6 +14,8 @@ except ImportError: ssl = None +support.requires("network") + TIMEOUT = 60 # seconds @@ -339,5 +341,4 @@ def test_ftp_timeout(self): if __name__ == "__main__": - support.requires("network") unittest.main() diff --git a/Misc/NEWS b/Misc/NEWS index f323b5866f5..4873297da6e 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -253,6 +253,9 @@ IDLE Tests ----- +- Issue #20070: Don't run test_urllib2net when network resources are not + enabled. + - Issue #19938: Re-enabled test_bug_1333982 in test_dis, which had been disabled since 3.0 due to the changes in listcomp handling.