[Pymoul-svn] SF.net SVN: pymoul: [260] pymoul/trunk

[<ti...@us...>]

Revision: 260
          http://pymoul.svn.sourceforge.net/pymoul/?rev=260&view=rev
Author:   tiran
Date:     2007-03-15 05:56:45 -0700 (Thu, 15 Mar 2007)

Log Message:
-----------
Fixed version requirements for py2app
Fixed locking unit tests

Modified Paths:
--------------
    pymoul/trunk/src/moul/osdependent/tests/test_singleapp.py
    pymoul/trunk/utilities/setup_darwin.py

Modified: pymoul/trunk/src/moul/osdependent/tests/test_singleapp.py
===================================================================
--- pymoul/trunk/src/moul/osdependent/tests/test_singleapp.py	2007-03-15 08:43:34 UTC (rev 259)
+++ pymoul/trunk/src/moul/osdependent/tests/test_singleapp.py	2007-03-15 12:56:45 UTC (rev 260)
@@ -89,8 +89,8 @@
                       stderr=PIPE, shell=True, env=env)
         popen.wait()
         self.failUnless(os.path.isfile(self.tmpfile))
-        
-        out = popen.stdout.read()
+
+        out = popen.stdout.read().strip()
         if os.name == 'nt':
             self.failUnless(self.tmpfile in out or out == '', out)
         elif os.name =='posix':
@@ -98,11 +98,14 @@
         else:
             raise OSError("unsupported os")
 
-        err = popen.stderr.read()
+        err = popen.stderr.read().strip()
         if os.name == 'nt':
             self.failUnless('WindowsError: [Error 13]' in err, err)
         elif os.name =='posix':
-            self.failUnless('IOError: [Errno 11]' in err, err)
+            # Mac: IOError: [Errno 35] Resource temporarily unavailable
+            # Linux: IOError: [Errno 11] Resource temporarily unavailable
+            self.failUnless('IOError:' in err, err)
+            self.failUnless('Resource temporarily unavailable' in err, err)
         else:
             raise OSError("unsupported os")
 

Modified: pymoul/trunk/utilities/setup_darwin.py
===================================================================
--- pymoul/trunk/utilities/setup_darwin.py	2007-03-15 08:43:34 UTC (rev 259)
+++ pymoul/trunk/utilities/setup_darwin.py	2007-03-15 12:56:45 UTC (rev 260)
@@ -38,7 +38,7 @@
     )
 
 def updateSetupOptions(kw):
-    for req in ("py2app >=0.3.56",):
+    for req in ("py2app>=0.3.6",):
         kw['setup_requires'].append(req)
     for req in ():
         kw['install_requires'].append(req)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.