commit 5c8da86f3a515ce1a6d5f27fd15e3c5f4d8e931e
author Benjamin Peterson <benjamin@python.org> Tue Jun 30 22:57:08 2009 +0000
committer Benjamin Peterson <benjamin@python.org> Tue Jun 30 22:57:08 2009 +0000
tree 41f38aca16748628d53906337f06fdf087f52314
parent be96cf608fa656d7e53144cf85082ed5661e8c13

convert usage of fail* to assert*

Lib/test/test_sets.py

diff --git a/Lib/test/test_sets.py b/Lib/test/test_sets.py
index efa388f..9c59836 100644
--- a/Lib/test/test_sets.py
+++ b/Lib/test/test_sets.py
@@ -76,7 +76,7 @@
 
     def test_iteration(self):
         for v in self.set:
-            self.assert_(v in self.values)
+            self.assertTrue(v in self.values)
 
     def test_pickling(self):
         p = pickle.dumps(self.set)
@@ -107,10 +107,10 @@
         self.repr   = "Set([3])"
 
     def test_in(self):
-        self.failUnless(3 in self.set)
+        self.assertTrue(3 in self.set)
 
     def test_not_in(self):
-        self.failUnless(2 not in self.set)
+        self.assertTrue(2 not in self.set)
 
 #------------------------------------------------------------------------------
 
@@ -124,10 +124,10 @@
         self.repr   = "Set([(0, 'zero')])"
 
     def test_in(self):
-        self.failUnless((0, "zero") in self.set)
+        self.assertTrue((0, "zero") in self.set)
 
     def test_not_in(self):
-        self.failUnless(9 not in self.set)
+        self.assertTrue(9 not in self.set)
 
 #------------------------------------------------------------------------------
 
@@ -406,7 +406,7 @@
             popped[self.set.pop()] = None
         self.assertEqual(len(popped), len(self.values))
         for v in self.values:
-            self.failUnless(v in popped)
+            self.assertTrue(v in popped)
 
     def test_update_empty_tuple(self):
         self.set.union_update(())
@@ -683,7 +683,7 @@
         set_list = list(self.set); set_list.sort()
         self.assertEqual(len(dup_list), len(set_list))
         for i in range(len(dup_list)):
-            self.failUnless(dup_list[i] is set_list[i])
+            self.assertTrue(dup_list[i] is set_list[i])
 
     def test_deep_copy(self):
         dup = copy.deepcopy(self.set)
@@ -733,13 +733,13 @@
 
     def test_binopsVsSubsets(self):
         a, b = self.a, self.b
-        self.assert_(a - b <= a)
-        self.assert_(b - a <= b)
-        self.assert_(a & b <= a)
-        self.assert_(a & b <= b)
-        self.assert_(a | b >= a)
-        self.assert_(a | b >= b)
-        self.assert_(a ^ b <= a | b)
+        self.assertTrue(a - b <= a)
+        self.assertTrue(b - a <= b)
+        self.assertTrue(a & b <= a)
+        self.assertTrue(a & b <= b)
+        self.assertTrue(a | b >= a)
+        self.assertTrue(a | b >= b)
+        self.assertTrue(a ^ b <= a | b)
 
     def test_commutativity(self):
         a, b = self.a, self.b
@@ -755,9 +755,9 @@
         self.assertEqual(a - a, zero)
         self.assertEqual(a | a, a)
         self.assertEqual(a & a, a)
-        self.assert_(a <= a)
-        self.assert_(a >= a)
-        self.assert_(a == a)
+        self.assertTrue(a <= a)
+        self.assertTrue(a >= a)
+        self.assertTrue(a == a)
 
     def test_summations(self):
         # check that sums of parts equal the whole