[Jython-checkins] SF.net SVN: jython:[5690] branches/astwrite

[<fwi...@us...>]

Revision: 5690
          http://jython.svn.sourceforge.net/jython/?rev=5690&view=rev
Author:   fwierzbicki
Date:     2008-12-04 02:11:59 +0000 (Thu, 04 Dec 2008)

Log Message:
-----------
Merged revisions 5687 via svnmerge from 
https://jython.svn.sourceforge.net/svnroot/jython/trunk/jython

........
  r5687 | nriley | 2008-12-03 17:08:15 -0500 (Wed, 03 Dec 2008) | 1 line
  
  avoid test_asynchat on Windows too; refs #1064
........

Modified Paths:
--------------
    branches/astwrite/Lib/test/test_asynchat.py

Property Changed:
----------------
    branches/astwrite/


Property changes on: branches/astwrite
___________________________________________________________________
Modified: svnmerge-integrated
   - /trunk/jython:1-5683
   + /trunk/jython:1-5689

Modified: branches/astwrite/Lib/test/test_asynchat.py
===================================================================
--- branches/astwrite/Lib/test/test_asynchat.py	2008-12-04 01:27:28 UTC (rev 5689)
+++ branches/astwrite/Lib/test/test_asynchat.py	2008-12-04 02:11:59 UTC (rev 5690)
@@ -7,7 +7,7 @@
 
 import platform
 os_name = platform.java_ver()[3][0]
-if os_name == 'Mac OS X' or 'BSD' in os_name:
+if os_name == 'Mac OS X' or 'BSD' in os_name or 'Windows' in os_name:
     raise test_support.TestSkipped('test_asynchat deadlocks on Jython/BSD: '
                                    'http://bugs.jython.org/issue1064')
 


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