[Python-checkins] r80003 - in python/branches/release31-maint: Lib/test/test_winsound.py

[stefan.krah]

Author: stefan.krah
Date: Mon Apr 12 17:34:39 2010
New Revision: 80003

Log:
Merged revisions 80002 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80002 | stefan.krah | 2010-04-12 17:33:12 +0200 (Mon, 12 Apr 2010) | 9 lines
  
  Merged revisions 80000 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r80000 | stefan.krah | 2010-04-12 17:21:25 +0200 (Mon, 12 Apr 2010) | 3 lines
    
    Issue #8367: Fix spurious test failure on systems without a sound card.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_winsound.py

Modified: python/branches/release31-maint/Lib/test/test_winsound.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_winsound.py	(original)
+++ python/branches/release31-maint/Lib/test/test_winsound.py	Mon Apr 12 17:34:39 2010
@@ -194,11 +194,9 @@
                 pass
             winsound.PlaySound(None, winsound.SND_PURGE)
         else:
-            self.assertRaises(
-                RuntimeError,
-                winsound.PlaySound,
-                None, winsound.SND_PURGE
-            )
+            # Issue 8367: PlaySound(None, winsound.SND_PURGE)
+            # does not raise on systems without a sound card.
+            pass
 
 
 def _get_cscript_path():