Don't use a hard coded port. This test could hang/fail if the port is in use.

Speed this test up by avoiding a sleep and using the event.
This commit is contained in:
Neal Norwitz 2008-02-26 04:50:37 +00:00
parent 3fa41d5a1c
commit b0917c14f2
1 changed files with 25 additions and 4 deletions

View File

@ -6,32 +6,47 @@ import time
from unittest import TestCase from unittest import TestCase
from test import test_support from test import test_support
server_port = None
# This function sets the evt 3 times:
# 1) when the connection is ready to be accepted.
# 2) when it is safe for the caller to close the connection
# 3) when we have closed the socket
def server(evt): def server(evt):
global server_port
serv = socket.socket(socket.AF_INET, socket.SOCK_STREAM) serv = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
serv.settimeout(3) serv.settimeout(3)
serv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) serv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
serv.bind(("", 9091)) server_port = test_support.bind_port(serv, "", 9091)
serv.listen(5) serv.listen(5)
# (1) Signal the caller that we are ready to accept the connection.
evt.set()
try: try:
conn, addr = serv.accept() conn, addr = serv.accept()
except socket.timeout: except socket.timeout:
pass pass
else: else:
conn.send("1 Hola mundo\n") conn.send("1 Hola mundo\n")
# (2) Signal the caller that it is safe to close the socket.
evt.set()
conn.close() conn.close()
finally: finally:
serv.close() serv.close()
# (3) Signal the caller that we are done.
evt.set() evt.set()
class GeneralTests(TestCase): class GeneralTests(TestCase):
def setUp(self): def setUp(self):
ftplib.FTP.port = 9091
self.evt = threading.Event() self.evt = threading.Event()
threading.Thread(target=server, args=(self.evt,)).start() threading.Thread(target=server, args=(self.evt,)).start()
time.sleep(.1) # Wait for the server to be ready.
self.evt.wait()
self.evt.clear()
ftplib.FTP.port = server_port
def tearDown(self): def tearDown(self):
# Wait on the closing of the socket (this shouldn't be necessary).
self.evt.wait() self.evt.wait()
def testBasic(self): def testBasic(self):
@ -40,30 +55,35 @@ class GeneralTests(TestCase):
# connects # connects
ftp = ftplib.FTP("localhost") ftp = ftplib.FTP("localhost")
self.evt.wait()
ftp.sock.close() ftp.sock.close()
def testTimeoutDefault(self): def testTimeoutDefault(self):
# default # default
ftp = ftplib.FTP("localhost") ftp = ftplib.FTP("localhost")
self.assertTrue(ftp.sock.gettimeout() is None) self.assertTrue(ftp.sock.gettimeout() is None)
self.evt.wait()
ftp.sock.close() ftp.sock.close()
def testTimeoutValue(self): def testTimeoutValue(self):
# a value # a value
ftp = ftplib.FTP("localhost", timeout=30) ftp = ftplib.FTP("localhost", timeout=30)
self.assertEqual(ftp.sock.gettimeout(), 30) self.assertEqual(ftp.sock.gettimeout(), 30)
self.evt.wait()
ftp.sock.close() ftp.sock.close()
def testTimeoutConnect(self): def testTimeoutConnect(self):
ftp = ftplib.FTP() ftp = ftplib.FTP()
ftp.connect("localhost", timeout=30) ftp.connect("localhost", timeout=30)
self.assertEqual(ftp.sock.gettimeout(), 30) self.assertEqual(ftp.sock.gettimeout(), 30)
self.evt.wait()
ftp.sock.close() ftp.sock.close()
def testTimeoutDifferentOrder(self): def testTimeoutDifferentOrder(self):
ftp = ftplib.FTP(timeout=30) ftp = ftplib.FTP(timeout=30)
ftp.connect("localhost") ftp.connect("localhost")
self.assertEqual(ftp.sock.gettimeout(), 30) self.assertEqual(ftp.sock.gettimeout(), 30)
self.evt.wait()
ftp.sock.close() ftp.sock.close()
def testTimeoutDirectAccess(self): def testTimeoutDirectAccess(self):
@ -71,6 +91,7 @@ class GeneralTests(TestCase):
ftp.timeout = 30 ftp.timeout = 30
ftp.connect("localhost") ftp.connect("localhost")
self.assertEqual(ftp.sock.gettimeout(), 30) self.assertEqual(ftp.sock.gettimeout(), 30)
self.evt.wait()
ftp.sock.close() ftp.sock.close()
def testTimeoutNone(self): def testTimeoutNone(self):
@ -82,10 +103,10 @@ class GeneralTests(TestCase):
finally: finally:
socket.setdefaulttimeout(previous) socket.setdefaulttimeout(previous)
self.assertEqual(ftp.sock.gettimeout(), 30) self.assertEqual(ftp.sock.gettimeout(), 30)
self.evt.wait()
ftp.close() ftp.close()
def test_main(verbose=None): def test_main(verbose=None):
test_support.run_unittest(GeneralTests) test_support.run_unittest(GeneralTests)