Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #19987: Merge with 3.3

This commit is contained in:
Zachary Ware 2013-12-16 09:05:44 -06:00
parent e9dacaa93f 1007432c95
commit d2e48ca813
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Lib/test/test_winsound.py
View File

@ -158,15 +158,15 @@ class PlaySoundTest(unittest.TestCase):
) )
def test_alias_fallback(self): def test_alias_fallback(self):
if _have_soundcard(): # In the absense of the ability to tell if a sound was actually
# played, this test has two acceptable outcomes: success (no error,
# sound was theoretically played; although as issue #19987 shows
# a box without a soundcard can "succeed") or RuntimeError. Any
# other error is a failure.
try:
winsound.PlaySound('!"$%&/(#+*', winsound.SND_ALIAS) winsound.PlaySound('!"$%&/(#+*', winsound.SND_ALIAS)
# see http://bugs.python.org/issue19987 except RuntimeError:
#else: pass
# self.assertRaises(
# RuntimeError,
# winsound.PlaySound,
# '!"$%&/(#+*', winsound.SND_ALIAS
# )
def test_alias_nofallback(self): def test_alias_nofallback(self):
if _have_soundcard(): if _have_soundcard():

2
Misc/NEWS
View File

@ -199,7 +199,7 @@ Tests
- Issue #19572: More skipped tests explicitly marked as skipped. - Issue #19572: More skipped tests explicitly marked as skipped.
- Issue #19595: Re-enabled a long-disabled test in test_winsound. - Issue #19595, #19987: Re-enabled a long-disabled test in test_winsound.
- Issue #19588: Fixed tests in test_random that were silently skipped most - Issue #19588: Fixed tests in test_random that were silently skipped most
of the time. Patch by Julian Gindi. of the time. Patch by Julian Gindi.