diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2013-12-16 15:05:44 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2013-12-16 15:05:44 (GMT) |
| commit | d2e48ca813a70edc4a28477c150ad8079df584e6 (patch) | |
| tree | 966755dcfd2714a7e54f6570b78e869615b1078f /Lib/test/test_winsound.py | |
| parent | e9dacaa93f64ba05f06c06db7d81571ba580a352 (diff) | |
| parent | 1007432c95acee46a09b08306ef1859b97a184b0 (diff) | |
| download | cpython-d2e48ca813a70edc4a28477c150ad8079df584e6.zip cpython-d2e48ca813a70edc4a28477c150ad8079df584e6.tar.gz cpython-d2e48ca813a70edc4a28477c150ad8079df584e6.tar.bz2 | |
Issue #19987: Merge with 3.3
Diffstat (limited to 'Lib/test/test_winsound.py')
| -rw-r--r-- | Lib/test/test_winsound.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Lib/test/test_winsound.py b/Lib/test/test_winsound.py index f1af2d2..83618b6 100644 --- a/Lib/test/test_winsound.py +++ b/Lib/test/test_winsound.py @@ -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(): |