Reverting the Revision: 77368. I committed Flox's big patch for tests by

mistake. ( It may come in for sure tough)

1 files changed, 19 insertions, 20 deletions

diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py
index 8595368..bc7465a 100644
--- a/Lib/test/test_set.py
+++ b/Lib/test/test_set.py
@@ -1218,16 +1218,15 @@ class TestOnlySetsInBinaryOps(unittest.TestCase):
         self.assertEqual(self.set != self.other, True)
 
     def test_ge_gt_le_lt(self):
-        with test_support.check_warnings():
-            self.assertRaises(TypeError, lambda: self.set < self.other)
-            self.assertRaises(TypeError, lambda: self.set <= self.other)
-            self.assertRaises(TypeError, lambda: self.set > self.other)
-            self.assertRaises(TypeError, lambda: self.set >= self.other)
+        self.assertRaises(TypeError, lambda: self.set < self.other)
+        self.assertRaises(TypeError, lambda: self.set <= self.other)
+        self.assertRaises(TypeError, lambda: self.set > self.other)
+        self.assertRaises(TypeError, lambda: self.set >= self.other)
 
-            self.assertRaises(TypeError, lambda: self.other < self.set)
-            self.assertRaises(TypeError, lambda: self.other <= self.set)
-            self.assertRaises(TypeError, lambda: self.other > self.set)
-            self.assertRaises(TypeError, lambda: self.other >= self.set)
+        self.assertRaises(TypeError, lambda: self.other < self.set)
+        self.assertRaises(TypeError, lambda: self.other <= self.set)
+        self.assertRaises(TypeError, lambda: self.other > self.set)
+        self.assertRaises(TypeError, lambda: self.other >= self.set)
 
     def test_update_operator(self):
         try:
@@ -1380,20 +1379,20 @@ class TestCopying(unittest.TestCase):
 
     def test_copy(self):
         dup = self.set.copy()
-        dup_list = list(dup)
-        set_list = list(self.set)
+        dup_list = list(dup); dup_list.sort()
+        set_list = list(self.set); set_list.sort()
         self.assertEqual(len(dup_list), len(set_list))
-        for elt in dup_list:
-            self.assertTrue(elt in set_list)
+        for i in range(len(dup_list)):
+            self.assertTrue(dup_list[i] is set_list[i])
 
     def test_deep_copy(self):
         dup = copy.deepcopy(self.set)
         ##print type(dup), repr(dup)
-        dup_list = list(dup)
-        set_list = list(self.set)
+        dup_list = list(dup); dup_list.sort()
+        set_list = list(self.set); set_list.sort()
         self.assertEqual(len(dup_list), len(set_list))
-        for elt in dup_list:
-            self.assertTrue(elt in set_list)
+        for i in range(len(dup_list)):
+            self.assertEqual(dup_list[i], set_list[i])
 
 #------------------------------------------------------------------------------
 
@@ -1553,7 +1552,7 @@ class TestVariousIteratorArgs(unittest.TestCase):
         for cons in (set, frozenset):
             for s in ("123", "", range(1000), ('do', 1.2), xrange(2000,2200,5)):
                 for g in (G, I, Ig, S, L, R):
-                    self.assertSameElements(cons(g(s)), g(s))
+                    self.assertEqual(sorted(cons(g(s))), sorted(g(s)))
                 self.assertRaises(TypeError, cons , X(s))
                 self.assertRaises(TypeError, cons , N(s))
                 self.assertRaises(ZeroDivisionError, cons , E(s))
@@ -1568,7 +1567,7 @@ class TestVariousIteratorArgs(unittest.TestCase):
                     if isinstance(expected, bool):
                         self.assertEqual(actual, expected)
                     else:
-                        self.assertSameElements(actual, expected)
+                        self.assertEqual(sorted(actual), sorted(expected))
                 self.assertRaises(TypeError, meth, X(s))
                 self.assertRaises(TypeError, meth, N(s))
                 self.assertRaises(ZeroDivisionError, meth, E(s))
@@ -1582,7 +1581,7 @@ class TestVariousIteratorArgs(unittest.TestCase):
                     t = s.copy()
                     getattr(s, methname)(list(g(data)))
                     getattr(t, methname)(g(data))
-                    self.assertSameElements(s, t)
+                    self.assertEqual(sorted(s), sorted(t))
 
                 self.assertRaises(TypeError, getattr(set('january'), methname), X(data))
                 self.assertRaises(TypeError, getattr(set('january'), methname), N(data))