Author: Alex Gaynor <alex.gay...@gmail.com>
Branch: stdlib-2.7.9
Changeset: r74930:460cc2dd9310
Date: 2014-12-14 10:45 -0800
http://bitbucket.org/pypy/pypy/changeset/460cc2dd9310/
Log: Resolved merge conflicts in test_ssl.py
diff --git a/lib-python/2.7/test/test_socket.py
b/lib-python/2.7/test/test_socket.py
--- a/lib-python/2.7/test/test_socket.py
+++ b/lib-python/2.7/test/test_socket.py
@@ -635,17 +635,8 @@
port = test_support.find_unused_port()
big_port = port + 65536
neg_port = port - 65536
-<<<<<<< local
- sock = socket.socket()
- try:
- self.assertRaises((OverflowError, ValueError), sock.bind, (host,
big_port))
- self.assertRaises((OverflowError, ValueError), sock.bind, (host,
neg_port))
- sock.bind((host, port))
- finally:
- sock.close()
-=======
- self.assertRaises(OverflowError, sock.bind, (HOST, big_port))
- self.assertRaises(OverflowError, sock.bind, (HOST, neg_port))
+ self.assertRaises((OverflowError, ValueError), sock.bind, (HOST,
big_port))
+ self.assertRaises((OverflowError, ValueError), sock.bind, (HOST,
neg_port))
# Since find_unused_port() is inherently subject to race conditions, we
# call it a couple times if necessary.
for i in itertools.count():
@@ -657,7 +648,6 @@
raise
else:
break
->>>>>>> other
@unittest.skipUnless(os.name == "nt", "Windows specific")
def test_sock_ioctl(self):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
