enable test_set and add more tests to set.py

from_cpython/Lib/test/test_set.py

-# expected: fail
-
 import unittest
 from test import test_support
 import gc
@@ -339,7 +337,9 @@ class TestJointOps(unittest.TestCase):
         obj.x = iter(container)
         del obj, container
         gc.collect()
-        self.assertTrue(ref() is None, "Cycle was not collected")
+        # Pyston change: because with conservative scanning
+        # it is hard to guarantee finalizer calls
+        # self.assertTrue(ref() is None, "Cycle was not collected")
 
 class TestSet(TestJointOps):
     thetype = set
@@ -560,7 +560,9 @@ class TestSet(TestJointOps):
         p = weakref.proxy(s)
         self.assertEqual(str(p), str(s))
         s = None
-        self.assertRaises(ReferenceError, str, p)
+        # Pyston change: because with conservative scanning
+        # it is hard to guarantee finalizer calls
+        # self.assertRaises(ReferenceError, str, p)
 
     @unittest.skipUnless(hasattr(set, "test_c_api"),
                          'C API test only available in a debug build')

test/tests/set.py

@@ -199,3 +199,54 @@ try:
     set(**dict(a=1))
 except TypeError:
     print "TypeError"
+
+
+class MySet(set):
+    def __new__(cls, *args, **kwargs):
+        return set.__new__(cls, *args)
+
+try:
+    MySet(a=1)
+except TypeError as e:
+    print(e.message)
+
+
+class SetSubclassWithKeywordArgs(set):
+    def __init__(self, iterable=[], newarg=None):
+        set.__init__(self, iterable)
+
+SetSubclassWithKeywordArgs(newarg=1)
+
+try:
+    frozenset(a=1)
+except TypeError as e:
+    print(e.message)
+
+
+class MyFrozenSet(frozenset):
+    def __new__(cls, *args, **kwargs):
+        return frozenset.__new__(cls, *args)
+
+MyFrozenSet(a=1)
+
+
+class FrozensetSubclassWithKeywordArgs(frozenset):
+    def __init__(self, iterable=[], newarg=None):
+        frozenset.__init__(self, iterable)
+
+FrozensetSubclassWithKeywordArgs(newarg=1)
+
+print(set() in frozenset([frozenset()]))
+
+
+class MySet(set):
+    def __hash__(self):
+        print("calling __hash__")
+        return id(self)
+
+print("Ready")
+foo = MySet()
+a = set()
+a.add(foo)
+print(a.remove(foo))
+print(foo in set())