[Python-checkins] python/dist/src/Lib/test test_sets.py,1.22,1.23

[tim_one@users.sourceforge.net]

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

Modified Files:
	test_sets.py 
Log Message:
TestOnlySetsInBinaryOps:  Simplified the non-inplace tests by using
assertRaises.  Fixed a repeated subtle bug in the inplace tests by
removing the possibilty that a self.fail() call could raise a
TypeError that the test catches by mistake.


Index: test_sets.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_sets.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** test_sets.py	2 Mar 2003 00:31:23 -0000	1.22
--- test_sets.py	2 Mar 2003 00:36:10 -0000	1.23
***************
*** 507,582 ****
          try:
              self.set |= self.other
-             self.fail("expected TypeError")
          except TypeError:
              pass
  
      def test_union(self):
!         try:
!             self.other | self.set
!             self.fail("expected TypeError")
!         except TypeError:
!             pass
!         try:
!             self.set | self.other
!             self.fail("expected TypeError")
!         except TypeError:
!             pass
  
      def test_intersection_update(self):
          try:
              self.set &= self.other
-             self.fail("expected TypeError")
          except TypeError:
              pass
  
      def test_intersection(self):
!         try:
!             self.other & self.set
!             self.fail("expected TypeError")
!         except TypeError:
!             pass
!         try:
!             self.set & self.other
!             self.fail("expected TypeError")
!         except TypeError:
!             pass
  
      def test_sym_difference_update(self):
          try:
              self.set ^= self.other
-             self.fail("expected TypeError")
          except TypeError:
              pass
  
      def test_sym_difference(self):
!         try:
!             self.other ^ self.set
!             self.fail("expected TypeError")
!         except TypeError:
!             pass
!         try:
!             self.set ^ self.other
!             self.fail("expected TypeError")
!         except TypeError:
!             pass
  
      def test_difference_update(self):
          try:
              self.set -= self.other
-             self.fail("expected TypeError")
          except TypeError:
              pass
  
      def test_difference(self):
!         try:
!             self.other - self.set
!             self.fail("expected TypeError")
!         except TypeError:
!             pass
!         try:
!             self.set - self.other
!             self.fail("expected TypeError")
!         except TypeError:
!             pass
  
  #------------------------------------------------------------------------------
--- 507,554 ----
          try:
              self.set |= self.other
          except TypeError:
              pass
+         else:
+             self.fail("expected TypeError")
  
      def test_union(self):
!         self.assertRaises(TypeError, lambda: self.set | self.other)
!         self.assertRaises(TypeError, lambda: self.other | self.set)
  
      def test_intersection_update(self):
          try:
              self.set &= self.other
          except TypeError:
              pass
+         else:
+             self.fail("expected TypeError")
  
      def test_intersection(self):
!         self.assertRaises(TypeError, lambda: self.set & self.other)
!         self.assertRaises(TypeError, lambda: self.other & self.set)
  
      def test_sym_difference_update(self):
          try:
              self.set ^= self.other
          except TypeError:
              pass
+         else:
+             self.fail("expected TypeError")
  
      def test_sym_difference(self):
!         self.assertRaises(TypeError, lambda: self.set ^ self.other)
!         self.assertRaises(TypeError, lambda: self.other ^ self.set)
  
      def test_difference_update(self):
          try:
              self.set -= self.other
          except TypeError:
              pass
+         else:
+             self.fail("expected TypeError")
  
      def test_difference(self):
!         self.assertRaises(TypeError, lambda: self.set - self.other)
!         self.assertRaises(TypeError, lambda: self.other - self.set)
  
  #------------------------------------------------------------------------------