[py-svn] r8332 - in py/dist/py/path: . local/testing

hpk at codespeak.net hpk at codespeak.net
Mon Jan 17 16:13:19 CET 2005


Author: hpk
Date: Mon Jan 17 16:13:19 2005
New Revision: 8332

Modified:
   py/dist/py/path/common.py
   py/dist/py/path/local/testing/test_local.py
Log:
some fixes 


Modified: py/dist/py/path/common.py
==============================================================================
--- py/dist/py/path/common.py	(original)
+++ py/dist/py/path/common.py	Mon Jan 17 16:13:19 2005
@@ -192,7 +192,7 @@
         #__tracebackhide__ = True
         try:
             return func(*args)
-        except (py.error.Error, KeyboardInterrupt, SystemExit):
+        except py.error.Error: 
             raise
         except EnvironmentError, e:
             if not hasattr(e, 'errno'):

Modified: py/dist/py/path/local/testing/test_local.py
==============================================================================
--- py/dist/py/path/local/testing/test_local.py	(original)
+++ py/dist/py/path/local/testing/test_local.py	Mon Jan 17 16:13:19 2005
@@ -114,14 +114,14 @@
 
     def test_ensure_filepath_withoutdir(self):
         tmpdir = self.tmpdir
-        newfile = tmpdir.join('test1')
+        newfile = tmpdir.join('test1file')
         t = newfile.ensure()
         assert t == newfile
         assert newfile.check(file=1)
 
     def test_ensure_dirpath(self):
         tmpdir = self.tmpdir
-        newfile = tmpdir.join('test1','test2')
+        newfile = tmpdir.join('test1','test2file')
         t = newfile.ensure(dir=1)
         assert t == newfile
         assert newfile.check(dir=1)



More information about the pytest-commit mailing list