diff options
Diffstat (limited to 'Lib/test/test_poplib.py')
| -rw-r--r-- | Lib/test/test_poplib.py | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/Lib/test/test_poplib.py b/Lib/test/test_poplib.py index 983cf21634..cd550df119 100644 --- a/Lib/test/test_poplib.py +++ b/Lib/test/test_poplib.py @@ -6,14 +6,10 @@ import time from unittest import TestCase from test import test_support +HOST = test_support.HOST -def server(ready, evt): - serv = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - serv.settimeout(3) - serv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - serv.bind(("", 9091)) +def server(evt, serv): serv.listen(5) - ready.set() try: conn, addr = serv.accept() except socket.timeout: @@ -29,27 +25,29 @@ class GeneralTests(TestCase): def setUp(self): self.evt = threading.Event() - self.ready = threading.Event() - threading.Thread(target=server, args=(self.ready, self.evt,)).start() - self.ready.wait() + self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + self.sock.settimeout(3) + self.port = test_support.bind_port(self.sock) + threading.Thread(target=server, args=(self.evt,self.sock)).start() + time.sleep(.1) def tearDown(self): self.evt.wait() def testBasic(self): # connects - pop = poplib.POP3("localhost", 9091) + pop = poplib.POP3(HOST, self.port) pop.sock.close() def testTimeoutDefault(self): # default - pop = poplib.POP3("localhost", 9091) + pop = poplib.POP3(HOST, self.port) self.assertTrue(pop.sock.gettimeout() is None) pop.sock.close() def testTimeoutValue(self): # a value - pop = poplib.POP3("localhost", 9091, timeout=30) + pop = poplib.POP3(HOST, self.port, timeout=30) self.assertEqual(pop.sock.gettimeout(), 30) pop.sock.close() @@ -58,7 +56,7 @@ class GeneralTests(TestCase): previous = socket.getdefaulttimeout() socket.setdefaulttimeout(30) try: - pop = poplib.POP3("localhost", 9091, timeout=None) + pop = poplib.POP3(HOST, self.port, timeout=None) finally: socket.setdefaulttimeout(previous) self.assertEqual(pop.sock.gettimeout(), 30) |