[Python-checkins] r80209 - python/branches/release26-maint/Lib/test/test_winsound.py
victor.stinner
python-checkins at python.org
Mon Apr 19 14:14:14 CEST 2010
Author: victor.stinner
Date: Mon Apr 19 14:14:14 2010
New Revision: 80209
Log:
Fix r80029 (backport of r80026), test_winsound: Python 2.6 has no
unittest.skipUnless(). Use raise test_support.TestSkipped() instead.
Modified:
python/branches/release26-maint/Lib/test/test_winsound.py
Modified: python/branches/release26-maint/Lib/test/test_winsound.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_winsound.py (original)
+++ python/branches/release26-maint/Lib/test/test_winsound.py Mon Apr 19 14:14:14 2010
@@ -95,8 +95,9 @@
"none", winsound.SND_ASYNC | winsound.SND_MEMORY
)
- @unittest.skipUnless(has_sound("SystemAsterisk"), "No default SystemAsterisk")
def test_alias_asterisk(self):
+ if not has_sound("SystemAsterisk"):
+ raise test_support.TestSkipped("No default SystemAsterisk")
if _have_soundcard():
winsound.PlaySound('SystemAsterisk', winsound.SND_ALIAS)
else:
@@ -106,8 +107,9 @@
'SystemAsterisk', winsound.SND_ALIAS
)
- @unittest.skipUnless(has_sound("SystemExclamation"), "No default SystemExclamation")
def test_alias_exclamation(self):
+ if not has_sound("SystemExclamation"):
+ raise test_support.TestSkipped("No default SystemExclamation")
if _have_soundcard():
winsound.PlaySound('SystemExclamation', winsound.SND_ALIAS)
else:
@@ -117,8 +119,9 @@
'SystemExclamation', winsound.SND_ALIAS
)
- @unittest.skipUnless(has_sound("SystemExit"), "No default SystemExit")
def test_alias_exit(self):
+ if not has_sound("SystemExit"):
+ raise test_support.TestSkipped("No default SystemExit")
if _have_soundcard():
winsound.PlaySound('SystemExit', winsound.SND_ALIAS)
else:
@@ -128,8 +131,9 @@
'SystemExit', winsound.SND_ALIAS
)
- @unittest.skipUnless(has_sound("SystemHand"), "No default SystemHand")
def test_alias_hand(self):
+ if not has_sound("SystemHand"):
+ raise test_support.TestSkipped("No default SystemHand")
if _have_soundcard():
winsound.PlaySound('SystemHand', winsound.SND_ALIAS)
else:
@@ -139,8 +143,9 @@
'SystemHand', winsound.SND_ALIAS
)
- @unittest.skipUnless(has_sound("SystemQuestion"), "No default SystemQuestion")
def test_alias_question(self):
+ if not has_sound("SystemQuestion"):
+ raise test_support.TestSkipped("No default SystemQuestion")
if _have_soundcard():
winsound.PlaySound('SystemQuestion', winsound.SND_ALIAS)
else:
More information about the Python-checkins
mailing list