summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2015-12-28 17:18:21 -0800
committerBrett Cannon <brett@python.org>2015-12-28 17:18:21 -0800
commitb4783f4bc187c319e472834c54937a7f0efea9c2 (patch)
tree002d8d402c6a4d3b247af496f6333d58b2076177
parent3c61a448f106c7cafb050ff7be5c5c421273e68f (diff)
parent150660eefd90e8004beb034ce885befed44df309 (diff)
downloadcpython-git-b4783f4bc187c319e472834c54937a7f0efea9c2.tar.gz
Merge
-rw-r--r--Lib/test/test_ssl.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 548feebb82..d1a908826d 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -1342,6 +1342,7 @@ class MemoryBIOTests(unittest.TestCase):
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 @@ class NetworkedBIOTests(unittest.TestCase):
% (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)