[py-svn] r51697 - in py/branch/event/py/test2: . testing

[hpk at codespeak.net]

Author: hpk
Date: Wed Feb 20 17:44:56 2008
New Revision: 51697

Modified:
   py/branch/event/py/test2/collect.py
   py/branch/event/py/test2/executor.py
   py/branch/event/py/test2/testing/test_present.py
Log:
fix for windows and python 2.4


Modified: py/branch/event/py/test2/collect.py
==============================================================================
--- py/branch/event/py/test2/collect.py	(original)
+++ py/branch/event/py/test2/collect.py	Wed Feb 20 17:44:56 2008
@@ -27,7 +27,7 @@
 import py
 from py.__.test2 import present
 
-sysex = (KeyboardInterrupt, SystemExit, GeneratorExit)
+sysex = (KeyboardInterrupt, SystemExit)
 
 def configproperty(name):
     def fget(self):

Modified: py/branch/event/py/test2/executor.py
==============================================================================
--- py/branch/event/py/test2/executor.py	(original)
+++ py/branch/event/py/test2/executor.py	Wed Feb 20 17:44:56 2008
@@ -9,7 +9,7 @@
 from py.__.test2 import repevent, present
 import py.__.test2.custompdb
 
-sysex = (KeyboardInterrupt, SystemExit, GeneratorExit)
+sysex = (KeyboardInterrupt, SystemExit)
 
 class RunExecutor(object):
     """ Same as in executor, but just running run

Modified: py/branch/event/py/test2/testing/test_present.py
==============================================================================
--- py/branch/event/py/test2/testing/test_present.py	(original)
+++ py/branch/event/py/test2/testing/test_present.py	Wed Feb 20 17:44:56 2008
@@ -40,8 +40,11 @@
     def setup_class(cls):
         cls.tmpdir = py.test2.ensuretemp(cls.__name__) 
 
-    def getpresenter(self, cmdlinearg=""):
-        config = py.test2.config._reparse([self.tmpdir, cmdlinearg])
+    def getpresenter(self, cmdlinearg=None):
+        args = [self.tmpdir]
+        if cmdlinearg:
+            args.append(cmdlinearg)
+        config = py.test2.config._reparse(args)
         return present.FuncPresenter(config)
 
     def gentest(self, check, **options):