[CMF-checkins] CVS: CMF/CMFSetup/tests - common.py:1.12 test_skins.py:1.7

[Tres Seaver]

Update of /cvs-repository/CMF/CMFSetup/tests
In directory cvs.zope.org:/tmp/cvs-serv20252/tests

Modified Files:
	common.py test_skins.py 
Log Message:


  - Fix some test failures on Windows (at least one remains).


=== CMF/CMFSetup/tests/common.py 1.11 => 1.12 ===
--- CMF/CMFSetup/tests/common.py:1.11	Thu Jul  1 19:14:23 2004
+++ CMF/CMFSetup/tests/common.py	Fri Jul  9 15:14:40 2004
@@ -66,7 +66,7 @@
 
     fqpath = os.path.join( subdir, filename )
 
-    file = open( fqpath, 'w' )
+    file = open( fqpath, 'wb' )
     file.write( contents )
     file.close()
     return fqpath


=== CMF/CMFSetup/tests/test_skins.py 1.6 => 1.7 ===
--- CMF/CMFSetup/tests/test_skins.py:1.6	Tue Jun  8 16:16:27 2004
+++ CMF/CMFSetup/tests/test_skins.py	Fri Jul  9 15:14:40 2004
@@ -13,6 +13,8 @@
 
 from Products.CMFCore.ActionProviderBase import ActionProviderBase
 from Products.CMFCore import DirectoryView
+from Products.CMFCore.utils import expandpath
+from Products.CMFCore.utils import minimalpath
 
 from common import BaseRegistryTests
 from common import DOMComparator
@@ -60,7 +62,7 @@
     def __init__( self, id ):
 
         self.id = id
-        self._dirpath = os.path.join( _TESTS_PATH, id )
+        self._dirpath = minimalpath( os.path.join(_TESTS_PATH, id) )
 
 class _SkinsSetup( BaseRegistryTests ):
 
@@ -84,7 +86,7 @@
         self.root.site = Folder( id='site' )
 
         for id, fsdv in fsdvs:
-            self._registerDirectoryView( fsdv._dirpath )
+            self._registerDirectoryView( expandpath(fsdv._dirpath) )
 
         self.root.site.portal_skins = DummySkinsTool( selections, fsdvs )