[py-svn] r57273 - py/branch/event/py/test2

hpk at codespeak.net hpk at codespeak.net
Fri Aug 15 13:49:39 CEST 2008


Author: hpk
Date: Fri Aug 15 13:49:35 2008
New Revision: 57273

Modified:
   py/branch/event/py/test2/session.py
Log:
small removals


Modified: py/branch/event/py/test2/session.py
==============================================================================
--- py/branch/event/py/test2/session.py	(original)
+++ py/branch/event/py/test2/session.py	Fri Aug 15 13:49:35 2008
@@ -41,13 +41,9 @@
         if option.runbrowser and not option.startserver:
             #print "--runbrowser implies --startserver"
             option.startserver = True
-        if self.config.getvalue("dist_boxed") and option.dist:
-            option.boxed = True
         # conflicting options
         if option.looponfailing and option.usepdb:
             raise ValueError, "--looponfailing together with --pdb not supported."
-        #if option.looponfailing and option.dist:
-        #    raise ValueError, "--looponfailing together with --dist not supported."
         if option.executable and option.usepdb:
             raise ValueError, "--exec together with --pdb not supported."
 
@@ -130,7 +126,6 @@
         except KeyboardInterrupt:
             exitstatus = outcome.EXIT_INTERRUPTED
         except:
-            raise
             self.bus.notify(event.InternalException())
             exitstatus = outcome.EXIT_INTERNALERROR
         if self._failurelist and exitstatus == 0:



More information about the pytest-commit mailing list