[Python-checkins] cpython (3.3): Issue #19987: Re-write test_alias_fallback in test_winsound to have two

[zach.ware]

http://hg.python.org/cpython/rev/5455456945d4
changeset:   88000:5455456945d4
branch:      3.3
parent:      87993:46c5adfeba9d
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Mon Dec 16 09:02:41 2013 -0600
summary:
  Issue #19987: Re-write test_alias_fallback in test_winsound to have two
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.

files:
  Lib/test/test_winsound.py |  15 ++++++++-------
  Misc/NEWS                 |   2 +-
  2 files changed, 9 insertions(+), 8 deletions(-)


diff --git a/Lib/test/test_winsound.py b/Lib/test/test_winsound.py
--- a/Lib/test/test_winsound.py
+++ b/Lib/test/test_winsound.py
@@ -158,14 +158,15 @@
             )
 
     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():
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -160,7 +160,7 @@
 - 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.

-- 
Repository URL: http://hg.python.org/cpython