*** test_socket.py.orig	Fri Jul 19 23:19:00 2002
--- test_socket.py	Fri Jul 19 23:32:36 2002
***************
*** 8,13 ****
--- 8,14 ----
  import time
  import thread, threading
  import Queue
+ import traceback
  
  PORT = 50007
  HOST = 'localhost'
***************
*** 374,379 ****
--- 375,383 ----
      def testRecvFrom(self):
          """Testing large recvfrom() over TCP."""
          msg, addr = self.cli_conn.recvfrom(1024)
+         if addr is None:
+             addr = self.cli_conn.getpeername()
+         print "\nmsg='%s', addr='%s'" % (msg, repr(addr))
          hostname, port = addr
          ##self.assertEqual(hostname, socket.gethostbyname('localhost'))
          self.assertEqual(msg, MSG)
***************
*** 384,391 ****
--- 388,401 ----
      def testOverFlowRecvFrom(self):
          """Testing recvfrom() in chunks over TCP."""
          seg1, addr = self.cli_conn.recvfrom(len(MSG)-3)
+         if addr is None:
+             addr = self.cli_conn.getpeername()
+         print "\nseg1='%s', addr='%s'" % (seg1, repr(addr))
          seg2, addr = self.cli_conn.recvfrom(1024)
+         if addr is None:
+             addr = self.cli_conn.getpeername()
          msg = seg1 + seg2
+         print "seg2='%s', addr='%s'" % (seg2, repr(addr))
          hostname, port = addr
          ##self.assertEqual(hostname, socket.gethostbyname('localhost'))
          self.assertEqual(msg, MSG)
***************
*** 444,449 ****
--- 454,461 ----
      def testRecvFrom(self):
          """Testing recvfrom() over UDP."""
          msg, addr = self.serv.recvfrom(len(MSG))
+         if addr is None:
+             addr = self.cli_conn.getpeername()
          hostname, port = addr
          ##self.assertEqual(hostname, socket.gethostbyname('localhost'))
          self.assertEqual(msg, MSG)
***************
*** 478,483 ****
--- 490,496 ----
          except socket.error:
              pass
          else:
+             print "\nconn=" + repr(conn) + "\naddr=" + repr(addr)
              self.fail("Error trying to do non-blocking accept.")
          read, write, err = select.select([self.serv], [], [])
          if self.serv in read:
***************
*** 486,491 ****
--- 499,505 ----
              self.fail("Error trying to do accept after select.")
  
      def _testAccept(self):
+         time.sleep(5)
          self.cli.connect((HOST, PORT))
  
      def testConnect(self):
***************
*** 505,510 ****
--- 519,525 ----
          except socket.error:
              pass
          else:
+             print "\nconn=" + repr(conn) + "\naddr=" + repr(addr)
              self.fail("Error trying to do non-blocking recv.")
          read, write, err = select.select([conn], [], [])
          if conn in read:
***************
*** 515,520 ****
--- 530,536 ----
  
      def _testRecv(self):
          self.cli.connect((HOST, PORT))
+         time.sleep(5)
          self.cli.send(MSG)
  
  class FileObjectClassTestCase(SocketConnectedTest):
***************
*** 574,580 ****
          self.cli_file.write(MSG)
          self.cli_file.flush()
  
! def main():
      suite = unittest.TestSuite()
      suite.addTest(unittest.makeSuite(GeneralModuleTests))
      suite.addTest(unittest.makeSuite(BasicTCPTest))
--- 590,596 ----
          self.cli_file.write(MSG)
          self.cli_file.flush()
  
! def test_main():
      suite = unittest.TestSuite()
      suite.addTest(unittest.makeSuite(GeneralModuleTests))
      suite.addTest(unittest.makeSuite(BasicTCPTest))
***************
*** 584,587 ****
      test_support.run_suite(suite)
  
  if __name__ == "__main__":
!     main()
--- 600,603 ----
      test_support.run_suite(suite)
  
  if __name__ == "__main__":
!     test_main()