cpython (merge default -> default): Merge
https://hg.python.org/cpython/rev/2e8f147c03b2 changeset: 99706:2e8f147c03b2 parent: 99705:b4c6631737b3 parent: 99704:9d0c15425b59 user: Brett Cannon <brett@python.org> date: Mon Dec 28 17:18:21 2015 -0800 summary: Merge files: Lib/test/test_ssl.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -1342,6 +1342,7 @@ self.assertRaises(TypeError, bio.write, 1) +@unittest.skipIf(True, "temporarily disabled: see #25940") class NetworkedTests(unittest.TestCase): def test_connect(self): @@ -1711,6 +1712,7 @@ % (count, func.__name__)) return ret + @unittest.skipIf(True, "temporarily disabled: see #25940") def test_handshake(self): with support.transient_internet("svn.python.org"): sock = socket.socket(socket.AF_INET) -- Repository URL: https://hg.python.org/cpython
participants (1)
-
brett.cannon