Changeset 391 for python/trunk/Lib/test/test_sunaudiodev.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/test/test_sunaudiodev.py (modified) (2 diffs)

python/trunk/Lib/test/test_sunaudiodev.py

@@ -1 @@
-from test.test_support import findfile, TestFailed, TestSkipped, import_module
+from test.test_support import findfile, TestFailed, import_module
+import unittest
 sunaudiodev = import_module('sunaudiodev', deprecated=True)
 import os
@@ -9 +10 @@
 
 if not os.path.exists(audiodev):
-    raise TestSkipped("no audio device found!")
+    raise unittest.SkipTest("no audio device found!")
 
 def play_sound_file(path):