[py-svn] r35764 - in py/dist/py: apigen/source test/rsession test/rsession/testing

[fijal at codespeak.net]

Author: fijal
Date: Thu Dec 14 22:12:30 2006
New Revision: 35764

Modified:
   py/dist/py/apigen/source/server.py
   py/dist/py/test/rsession/master.py
   py/dist/py/test/rsession/testing/test_web.py
   py/dist/py/test/rsession/testing/test_webjs.py
Log:
Unify pypy skips.


Modified: py/dist/py/apigen/source/server.py
==============================================================================
--- py/dist/py/apigen/source/server.py	(original)
+++ py/dist/py/apigen/source/server.py	Thu Dec 14 22:12:30 2006
@@ -7,7 +7,7 @@
 try:
     from pypy.translator.js.examples import server
 except ImportError:
-    py.test.skip("PyPy not present")
+    py.test.skip("PyPy not found")
 from py.__.apigen.source.browser import parse_path
 from py.__.apigen.source.html import create_html
 from py.xml import html

Modified: py/dist/py/test/rsession/master.py
==============================================================================
--- py/dist/py/test/rsession/master.py	(original)
+++ py/dist/py/test/rsession/master.py	Thu Dec 14 22:12:30 2006
@@ -34,20 +34,25 @@
     from py.__.test.rsession.rsession import session_options
     
     max_tasks_per_node = session_options.max_tasks_per_node
-    while 1:
-        try:
-            for node in masternodes:
-                if len(node.pending) < max_tasks_per_node:
-                    item = itemgenerator.next()
-                    if shouldstop():
-                        for _node in masternodes:
-                            _node.send(StopIteration) # magic connector
-                        return
-                    node.send(item)
-        except StopIteration:
-            break
-        waiter()
-  
+    try:
+        while 1:
+            try:
+                for node in masternodes:
+                    if len(node.pending) < max_tasks_per_node:
+                        item = itemgenerator.next()
+                        if shouldstop():
+                            for _node in masternodes:
+                                _node.send(StopIteration) # magic connector
+                            return
+                        node.send(item)
+            except StopIteration:
+                break
+            waiter()
+    except (KeyboardInterrupt, SystemExit):
+        for _node in masternodes:
+            _node.send(StopIteration)
+        raise
+
 def setup_slave(gateway, pkgpath, options):
     from py.__.test.rsession import slave
     import os

Modified: py/dist/py/test/rsession/testing/test_web.py
==============================================================================
--- py/dist/py/test/rsession/testing/test_web.py	(original)
+++ py/dist/py/test/rsession/testing/test_web.py	Thu Dec 14 22:12:30 2006
@@ -10,7 +10,7 @@
     
     commproxy.USE_MOCHIKIT = False
 except ImportError:
-    py.test.skip("No PyPy detected")
+    py.test.skip("PyPy not found")
 
 def setup_module(mod):
     config, args = py.test.Config.parse([])

Modified: py/dist/py/test/rsession/testing/test_webjs.py
==============================================================================
--- py/dist/py/test/rsession/testing/test_webjs.py	(original)
+++ py/dist/py/test/rsession/testing/test_webjs.py	Thu Dec 14 22:12:30 2006
@@ -2,7 +2,7 @@
 try:
     import pypy
 except ImportError:
-    py.test.skip('missing PyPy')
+    py.test.skip('PyPy not found')
 
 from pypy.translator.js.tester import schedule_callbacks
 here = py.magic.autopath().dirpath()