Fix test in the regression testsuite to work for stackless.

kristjan.jonsson · kristjan.jonsson · commit 3fb8677e85d8 · 2010-06-29T15:53:51.000Z
git-svn-id: http://svn.python.org/projects/stackless/trunk@82372 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Lib/test/exception_hierarchy.txt b/Lib/test/exception_hierarchy.txt
@@ -1,5 +1,6 @@
 BaseException
  +-- SystemExit
+      +-- TaskletExit
  +-- KeyboardInterrupt
  +-- GeneratorExit
  +-- Exception
diff --git a/Lib/test/test_pep352.py b/Lib/test/test_pep352.py
@@ -45,6 +45,12 @@ def test_inheritance(self):
         exc_set = set(x for x in dir(exceptions) if not x.startswith('_'))
         inheritance_tree = open(os.path.join(os.path.split(__file__)[0],
                                                 'exception_hierarchy.txt'))
+        haveStackless = False
+        try:
+            import stackless
+            haveStackless = True
+        except ImportError:
+            pass
         try:
             superclass_name = inheritance_tree.readline().rstrip()
             try:
@@ -72,6 +78,8 @@ def test_inheritance(self):
                 try:
                     exc = getattr(__builtin__, exc_name)
                 except AttributeError:
+                    if exc_name == "TaskletExit" and not haveStackless:
+                        continue
                     self.fail("%s not a built-in exception" % exc_name)
                 if last_depth < depth:
                     superclasses.append((last_depth, last_exc))
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
@@ -598,7 +598,8 @@ def method():
         import __builtin__
         check(__builtin__.file.closed, size(h + '2PP'))
         # wrapper_descriptor (descriptor object)
-        check(int.__add__, size(h + '2P2P'))
+        slpmask = "i" if haveStackless else ""
+        check(int.__add__, size(h + '2P2P'+slpmask))
         # dictproxy
         class C(object): pass
         check(C.__dict__, size(h + 'P'))
