Merged revisions 62039-62042 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62039 | georg.brandl | 2008-03-29 06:24:23 -0700 (Sat, 29 Mar 2008) | 3 lines

  Properly check for consistency with the third argument of
  compile() when compiling an AST node.
........
  r62040 | amaury.forgeotdarc | 2008-03-29 06:47:05 -0700 (Sat, 29 Mar 2008) | 5 lines

  The buildbot "x86 W2k8 trunk" seems to hang in test_socket.
  http://www.python.org/dev/buildbot/trunk/x86%20W2k8%20trunk/builds/255/step-test/0

  Temporarily increase verbosity of this test.
........
  r62042 | amaury.forgeotdarc | 2008-03-29 07:53:05 -0700 (Sat, 29 Mar 2008) | 3 lines

  Still investigating on the hanging test_socket.
  the test itself doesn't do anything on windows, focus on setUp and tearDown.
........
This commit is contained in:
Neal Norwitz 2008-03-31 04:20:05 +00:00
parent 9367c78c84
commit db4115ffc0
6 changed files with 69 additions and 28 deletions

View file

@ -15,6 +15,14 @@ import array
from weakref import proxy
import signal
# Temporary hack to see why test_socket hangs on one buildbot
if os.environ.get('COMPUTERNAME') == "GRAPE":
def verbose_write(arg):
print(arg, file=sys.__stdout__)
else:
def verbose_write(arg):
pass
PORT = 50007
HOST = 'localhost'
MSG = b'Michael Gilfix was here\n'
@ -22,15 +30,21 @@ MSG = b'Michael Gilfix was here\n'
class SocketTCPTest(unittest.TestCase):
def setUp(self):
verbose_write(self)
self.serv = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.serv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
verbose_write(str(self) + " socket created")
global PORT
PORT = test_support.bind_port(self.serv, HOST, PORT)
verbose_write(str(self) + " start listening")
self.serv.listen(1)
verbose_write(str(self) + " started")
def tearDown(self):
verbose_write(str(self) + " close")
self.serv.close()
self.serv = None
verbose_write(str(self) + " done")
class SocketUDPTest(unittest.TestCase):