[py-svn] r37948 - in py/trunk/py/test/rsession: . testing

hpk at codespeak.net hpk at codespeak.net
Mon Feb 5 01:36:03 CET 2007


Author: hpk
Date: Mon Feb  5 01:36:00 2007
New Revision: 37948

Modified:
   py/trunk/py/test/rsession/hostmanage.py
   py/trunk/py/test/rsession/testing/test_hostmanage.py
Log:
fix for win32


Modified: py/trunk/py/test/rsession/hostmanage.py
==============================================================================
--- py/trunk/py/test/rsession/hostmanage.py	(original)
+++ py/trunk/py/test/rsession/hostmanage.py	Mon Feb  5 01:36:00 2007
@@ -41,7 +41,9 @@
             import os
             targetdir = %r
             if not os.path.isabs(targetdir):
-                homedir = os.environ['HOME']
+                homedir = os.environ.get('HOME', '')
+                if not homedir:
+                    homedir = os.environ.get('HOMEPATH', '.')
                 targetdir = os.path.join(homedir, targetdir)
             if not os.path.exists(targetdir):
                 os.makedirs(targetdir)

Modified: py/trunk/py/test/rsession/testing/test_hostmanage.py
==============================================================================
--- py/trunk/py/test/rsession/testing/test_hostmanage.py	(original)
+++ py/trunk/py/test/rsession/testing/test_hostmanage.py	Mon Feb  5 01:36:00 2007
@@ -43,7 +43,7 @@
         x.initgateway()
         assert x.gw
         try:
-            homedir = py.path.local(py.std.os.environ['HOME'])
+            homedir = py.path.local._gethomedir() 
             expected = homedir.join(name) 
             assert x.gw_remotepath == str(expected)
             assert x.localdest == expected 



More information about the pytest-commit mailing list