]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue #19987: Re-write test_alias_fallback in test_winsound to have two
authorZachary Ware <zachary.ware@gmail.com>
Mon, 16 Dec 2013 15:02:41 +0000 (09:02 -0600)
committerZachary Ware <zachary.ware@gmail.com>
Mon, 16 Dec 2013 15:02:41 +0000 (09:02 -0600)
acceptable outcomes: success or RuntimeError. Without being able to
actually hear whether a sound was played, either one could be right, but
any other error would be a failure.

Lib/test/test_winsound.py
Misc/NEWS

index 27597874a8e0ffd956741e8ba0f9cb01c27c94a2..069adc398106df8d4b03ac637617a222cd0f069c 100644 (file)
@@ -158,14 +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)
-        else:
-            self.assertRaises(
-                RuntimeError,
-                winsound.PlaySound,
-                '!"$%&/(#+*', winsound.SND_ALIAS
-            )
+        except RuntimeError:
+            pass
 
     def test_alias_nofallback(self):
         if _have_soundcard():
index b0c1e36684caccc295f4b00b07ea77e573ffc580..cacfb7c6b7b5a8e3e69ce470dabe9339ee79a023 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -160,7 +160,7 @@ Tests
 - Issue #19926: Removed unneeded test_main from test_abstract_numbers.
   Patch by Vajrasky Kok.
 
-- 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.