From: doko@ubuntu.com <doko@ubuntu.com>
Date: Thu, 26 Dec 2013 16:37:11 +0000 (+0100)
Subject: - Issue #20070: Don't run test_urllib2net when network resources are not
X-Git-Tag: v3.4.0b2~87
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e575148cc23283f72aeeb0bff4a9343ce738aa92;p=python

- Issue #20070: Don't run test_urllib2net when network resources are not
  enabled.
---

diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py
index fba3ceac83..ab638eae2f 100644
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@ -14,6 +14,8 @@ try:
 except ImportError:
     ssl = None
 
+support.requires("network")
+
 TIMEOUT = 60  # seconds
 
 
@@ -339,5 +341,4 @@ class TimeoutTest(unittest.TestCase):
 
 
 if __name__ == "__main__":
-    support.requires("network")
     unittest.main()
diff --git a/Misc/NEWS b/Misc/NEWS
index f323b5866f..4873297da6 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.