mirror of https://github.com/python/cpython
Issue #19987: Merge with 3.3
This commit is contained in:
commit
d2e48ca813
|
@ -158,15 +158,15 @@ class PlaySoundTest(unittest.TestCase):
|
|||
)
|
||||
|
||||
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)
|
||||
# see http://bugs.python.org/issue19987
|
||||
#else:
|
||||
# self.assertRaises(
|
||||
# RuntimeError,
|
||||
# winsound.PlaySound,
|
||||
# '!"$%&/(#+*', winsound.SND_ALIAS
|
||||
# )
|
||||
except RuntimeError:
|
||||
pass
|
||||
|
||||
def test_alias_nofallback(self):
|
||||
if _have_soundcard():
|
||||
|
|
|
@ -199,7 +199,7 @@ Tests
|
|||
|
||||
- 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
|
||||
of the time. Patch by Julian Gindi.
|
||||
|
|
Loading…
Reference in New Issue