1 From 9a583b9665c50dfe27b0965128649ae1a7cd2ac6 Mon Sep 17 00:00:00 2001
2 From: Kacper Kornet <draenog@pld-linux.org>
3 Date: Mon, 20 May 2013 01:08:50 +0100
4 Subject: [PATCH] Mark tests that require access to resolver
7 Lib/test/checkDNS.py | 3 +++
8 Lib/test/test_mimetools.py | 2 ++
9 Lib/test/test_smtplib.py | 7 +++++++
10 Lib/test/test_urllib.py | 2 ++
11 4 files changed, 14 insertions(+)
12 create mode 100644 Lib/test/checkDNS.py
15 index 0000000..f77cbe7
17 +++ b/Lib/test/checkDNS.py
21 +canresolve = os.access("/etc/resolv.conf", os.R_OK)
22 index 86a26dc..8f07ada 100644
23 --- a/Lib/test/test_mimetools.py
24 +++ b/Lib/test/test_mimetools.py
27 from test import test_support
28 +from test import checkDNS
32 @@ -27,6 +28,7 @@ class MimeToolsTest(unittest.TestCase):
33 mimetools.decode(i, o, enc)
34 self.assertEqual(o.getvalue(), start)
36 + @unittest.skipUnless(checkDNS.canresolve, 'test requires name resolution')
37 def test_boundary(self):
40 index 81806c9..d88fd97 100644
41 --- a/Lib/test/test_smtplib.py
42 +++ b/Lib/test/test_smtplib.py
43 @@ -10,6 +10,7 @@ import select
46 from test import test_support
47 +from test import checkDNS
51 @@ -60,11 +61,13 @@ class GeneralTests(unittest.TestCase):
53 test_support.threading_cleanup(*self._threads)
55 + @unittest.skipUnless(checkDNS.canresolve, 'test requires name resolution')
58 smtp = smtplib.SMTP(HOST, self.port)
61 + @unittest.skipUnless(checkDNS.canresolve, 'test requires name resolution')
63 # connects, include port in host name
64 smtp = smtplib.SMTP("%s:%s" % (HOST, self.port))
65 @@ -76,6 +79,7 @@ class GeneralTests(unittest.TestCase):
66 self.assertEqual(smtp.local_hostname, "testhost")
69 + @unittest.skipUnless(checkDNS.canresolve, 'test requires name resolution')
70 def testTimeoutDefault(self):
71 self.assertTrue(socket.getdefaulttimeout() is None)
72 socket.setdefaulttimeout(30)
73 @@ -86,6 +90,7 @@ class GeneralTests(unittest.TestCase):
74 self.assertEqual(smtp.sock.gettimeout(), 30)
77 + @unittest.skipUnless(checkDNS.canresolve, 'test requires name resolution')
78 def testTimeoutNone(self):
79 self.assertTrue(socket.getdefaulttimeout() is None)
80 socket.setdefaulttimeout(30)
81 @@ -96,6 +101,7 @@ class GeneralTests(unittest.TestCase):
82 self.assertTrue(smtp.sock.gettimeout() is None)
85 + @unittest.skipUnless(checkDNS.canresolve, 'test requires name resolution')
86 def testTimeoutValue(self):
87 smtp = smtplib.SMTP(HOST, self.port, timeout=30)
88 self.assertEqual(smtp.sock.gettimeout(), 30)
89 @@ -243,6 +249,7 @@ class DebuggingServerTests(unittest.TestCase):
91 class NonConnectingTests(unittest.TestCase):
93 + @unittest.skipUnless(checkDNS.canresolve, 'test requires name resolution')
94 def testNotConnected(self):
95 # Test various operations on an unconnected SMTP object that
96 # should raise exceptions (at present the attempt in SMTP.send
97 index 3a273f8..e6a4c73 100644
98 --- a/Lib/test/test_urllib.py
99 +++ b/Lib/test/test_urllib.py
100 @@ -11,6 +11,7 @@ import StringIO
102 from test import test_support
103 from base64 import b64encode
104 +from test import checkDNS
108 @@ -222,6 +223,7 @@ Content-Type: text/html; charset=iso-8859-1
112 + @unittest.skipUnless(checkDNS.canresolve, 'test requires name resolution')
113 def test_missing_localfile(self):
114 self.assertRaises(IOError, urllib.urlopen,
115 'file://localhost/a/missing/file.py')