Issue #19987: Merge with 3.3

This commit is contained in:
Zachary Ware 2013-12-16 09:05:44 -06:00
commit d2e48ca813
2 changed files with 9 additions and 9 deletions

View file

@ -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():