[Python-checkins] python/dist/src/Lib/test test_socket.py,1.25,1.26

[gvanrossum@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv28648

Modified Files:
	test_socket.py 
Log Message:
Lose the message on assertEqual calls -- they actually hide
information on what went wrong.


Index: test_socket.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_socket.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** test_socket.py	12 Jun 2002 19:18:08 -0000	1.25
--- test_socket.py	12 Jun 2002 20:38:30 -0000	1.26
***************
*** 271,275 ****
          """Testing large receive over TCP."""
          msg = self.cli_conn.recv(1024)
!         self.assertEqual(msg, MSG, "Error performing recv.")
  
      def _testRecv(self):
--- 271,275 ----
          """Testing large receive over TCP."""
          msg = self.cli_conn.recv(1024)
!         self.assertEqual(msg, MSG)
  
      def _testRecv(self):
***************
*** 281,285 ****
          seg2 = self.cli_conn.recv(1024)
          msg = ''.join ((seg1, seg2))
!         self.assertEqual(msg, MSG, "Error performing recv in chunks.")
  
      def _testOverFlowRecv(self):
--- 281,285 ----
          seg2 = self.cli_conn.recv(1024)
          msg = ''.join ((seg1, seg2))
!         self.assertEqual(msg, MSG)
  
      def _testOverFlowRecv(self):
***************
*** 290,296 ****
          msg, addr = self.cli_conn.recvfrom(1024)
          hostname, port = addr
!         self.assertEqual (hostname, socket.gethostbyname('localhost'),
!                           "Wrong address from recvfrom.")
!         self.assertEqual(msg, MSG, "Error performing recvfrom.")
  
      def _testRecvFrom(self):
--- 290,295 ----
          msg, addr = self.cli_conn.recvfrom(1024)
          hostname, port = addr
!         self.assertEqual(hostname, socket.gethostbyname('localhost'))
!         self.assertEqual(msg, MSG)
  
      def _testRecvFrom(self):
***************
*** 303,309 ****
          msg = ''.join((seg1, seg2))
          hostname, port = addr
!         self.assertEqual(hostname, socket.gethostbyname('localhost'),
!                          "Wrong address from recvfrom.")
!         self.assertEqual(msg, MSG, "Error performing recvfrom in chunks.")
  
      def _testOverFlowRecvFrom(self):
--- 302,307 ----
          msg = ''.join((seg1, seg2))
          hostname, port = addr
!         self.assertEqual(hostname, socket.gethostbyname('localhost'))
!         self.assertEqual(msg, MSG)
  
      def _testOverFlowRecvFrom(self):
***************
*** 329,333 ****
          sock = socket.fromfd(fd, socket.AF_INET, socket.SOCK_STREAM)
          msg = sock.recv(1024)
!         self.assertEqual(msg, MSG, "Error creating socket using fromfd.")
  
      def _testFromFd(self):
--- 327,331 ----
          sock = socket.fromfd(fd, socket.AF_INET, socket.SOCK_STREAM)
          msg = sock.recv(1024)
!         self.assertEqual(msg, MSG)
  
      def _testFromFd(self):
***************
*** 337,341 ****
          """Testing shutdown()."""
          msg = self.cli_conn.recv(1024)
!         self.assertEqual(msg, MSG, "Error testing shutdown.")
  
      def _testShutdown(self):
--- 335,339 ----
          """Testing shutdown()."""
          msg = self.cli_conn.recv(1024)
!         self.assertEqual(msg, MSG)
  
      def _testShutdown(self):
***************
*** 351,355 ****
          """Testing sendto() and Recv() over UDP."""
          msg = self.serv.recv(len(MSG))
!         self.assertEqual(msg, MSG, "Error performing sendto")
  
      def _testSendtoAndRecv(self):
--- 349,353 ----
          """Testing sendto() and Recv() over UDP."""
          msg = self.serv.recv(len(MSG))
!         self.assertEqual(msg, MSG)
  
      def _testSendtoAndRecv(self):
***************
*** 360,366 ****
          msg, addr = self.serv.recvfrom(len(MSG))
          hostname, port = addr
!         self.assertEqual(hostname, socket.gethostbyname('localhost'),
!                          "Wrong address from recvfrom.")
!         self.assertEqual(msg, MSG, "Error performing recvfrom in chunks.")
  
      def _testRecvfrom(self):
--- 358,363 ----
          msg, addr = self.serv.recvfrom(len(MSG))
          hostname, port = addr
!         self.assertEqual(hostname, socket.gethostbyname('localhost'))
!         self.assertEqual(msg, MSG)
  
      def _testRecvfrom(self):
***************
*** 437,441 ****
          if conn in read:
              msg = conn.recv(len(MSG))
!             self.assertEqual(msg, MSG, "Error performing non-blocking recv.")
          else:
              self.fail("Error during select call to non-blocking socket.")
--- 434,438 ----
          if conn in read:
              msg = conn.recv(len(MSG))
!             self.assertEqual(msg, MSG)
          else:
              self.fail("Error during select call to non-blocking socket.")
***************
*** 474,478 ****
          second_seg = self.serv_file.read(3)
          msg = ''.join((first_seg, second_seg))
!         self.assertEqual(msg, MSG, "Error performing small read.")
  
      def _testSmallRead(self):
--- 471,475 ----
          second_seg = self.serv_file.read(3)
          msg = ''.join((first_seg, second_seg))
!         self.assertEqual(msg, MSG)
  
      def _testSmallRead(self):
***************
*** 485,489 ****
          while 1:
              char = self.serv_file.read(1)
!             self.failIf(not char, "Error performing unbuffered read.")
              buf += char
              if buf == MSG:
--- 482,486 ----
          while 1:
              char = self.serv_file.read(1)
!             self.failIf(not char)
              buf += char
              if buf == MSG:
***************
*** 497,501 ****
          """Performing file readline test."""
          line = self.serv_file.readline()
!         self.assertEqual(line, MSG, "Error performing readline.")
  
      def _testReadline(self):
--- 494,498 ----
          """Performing file readline test."""
          line = self.serv_file.readline()
!         self.assertEqual(line, MSG)
  
      def _testReadline(self):