[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

[senthil.kumaran]

http://hg.python.org/cpython/rev/54f1168036f1
changeset:   90311:54f1168036f1
parent:      90309:57fb5441a4aa
parent:      90310:2755403682ad
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Mon Apr 14 21:32:13 2014 -0400
summary:
  merge 3.4

files:
  Lib/test/test_urllibnet.py |  10 +++-------
  1 files changed, 3 insertions(+), 7 deletions(-)


diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py
--- a/Lib/test/test_urllibnet.py
+++ b/Lib/test/test_urllibnet.py
@@ -10,6 +10,8 @@
 import time
 
 
+support.requires('network')
+
 class URLTimeoutTest(unittest.TestCase):
     # XXX this test doesn't seem to test anything useful.
 
@@ -206,11 +208,5 @@
                                 " >= total size in %s" % records_repr)
 
 
-def test_main():
-    support.requires('network')
-    support.run_unittest(URLTimeoutTest,
-                         urlopenNetworkTests,
-                         urlretrieveNetworkTests)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()

-- 
Repository URL: http://hg.python.org/cpython