[py-svn] r38078 - in py/trunk/py: misc/testing test/rsession test/rsession/testing

[hpk at codespeak.net]

Author: hpk
Date: Wed Feb  7 16:54:50 2007
New Revision: 38078

Modified:
   py/trunk/py/misc/testing/test_update_website.py
   py/trunk/py/test/rsession/hostmanage.py
   py/trunk/py/test/rsession/rsession.py
   py/trunk/py/test/rsession/testing/test_executor.py
   py/trunk/py/test/rsession/testing/test_rsession.py
Log:
some fixes and test skips for win32 (otherwise all tests 
pass for me on win32)



Modified: py/trunk/py/misc/testing/test_update_website.py
==============================================================================
--- py/trunk/py/misc/testing/test_update_website.py	(original)
+++ py/trunk/py/misc/testing/test_update_website.py	Wed Feb  7 16:54:50 2007
@@ -44,6 +44,8 @@
     return pkgpath
 
 def test_run_tests():
+    if py.std.sys.platform == "win32":
+        py.test.skip("update_website is not supposed to be run from win32")
     pkgpath = setup_pkg('update_website_run_tests')
     errors = update_website.run_tests(pkgpath)
     assert not errors

Modified: py/trunk/py/test/rsession/hostmanage.py
==============================================================================
--- py/trunk/py/test/rsession/hostmanage.py	(original)
+++ py/trunk/py/test/rsession/hostmanage.py	Wed Feb  7 16:54:50 2007
@@ -183,7 +183,7 @@
     homedir = os.environ.get('HOME', '')
     if not homedir:
         homedir = os.environ.get('HOMEPATH', '.')
-    return homedir
+    return os.path.abspath(homedir)
 
 def getpath_relto_home(targetpath):
     import os

Modified: py/trunk/py/test/rsession/rsession.py
==============================================================================
--- py/trunk/py/test/rsession/rsession.py	(original)
+++ py/trunk/py/test/rsession/rsession.py	Wed Feb  7 16:54:50 2007
@@ -17,8 +17,6 @@
 from py.__.test.session import Session
 from py.__.test.outcome import Skipped, Failed
 
-old_fork = os.fork
-
 class AbstractSession(Session): 
     """
         An abstract session executes collectors/items through a runner. 

Modified: py/trunk/py/test/rsession/testing/test_executor.py
==============================================================================
--- py/trunk/py/test/rsession/testing/test_executor.py	(original)
+++ py/trunk/py/test/rsession/testing/test_executor.py	Wed Feb  7 16:54:50 2007
@@ -7,9 +7,9 @@
 from py.__.test.rsession.outcome import ReprOutcome
 from py.__.test.rsession.testing.basetest import BasicRsessionTest
 
-#def setup_module(mod):
-#    mod.rootdir = py.path.local(py.__file__).dirpath().dirpath()
-#    mod.config = py.test.config._reparse([mod.rootdir])
+def setup_module(mod):
+    if py.std.sys.platform == "win32":
+        py.test.skip("skipping executor tests (some require os.fork)")
 
 class ItemTestPassing(py.test.Item):    
     def run(self):

Modified: py/trunk/py/test/rsession/testing/test_rsession.py
==============================================================================
--- py/trunk/py/test/rsession/testing/test_rsession.py	(original)
+++ py/trunk/py/test/rsession/testing/test_rsession.py	Wed Feb  7 16:54:50 2007
@@ -11,6 +11,8 @@
 
 def setup_module(mod):
     mod.pkgdir = py.path.local(py.__file__).dirpath()
+    if py.std.sys.platform == "win32":
+        py.test.skip("rsession tests disabled for win32")
 
 def test_example_tryiter():
     events = []