Changeset 391 for python/trunk/Lib/test/test_linuxaudiodev.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_linuxaudiodev.py (modified) (3 diffs)

python/trunk/Lib/test/test_linuxaudiodev.py

@@ -2 +2 @@
 test_support.requires('audio')
 
-from test.test_support import findfile, TestSkipped, run_unittest
+from test.test_support import findfile, run_unittest
 
 import errno
-linuxaudiodev = test_support.import_module('linuxaudiodev', deprecated=True)
 import sys
-import sunaudio
 import audioop
 import unittest
+
+linuxaudiodev = test_support.import_module('linuxaudiodev', deprecated=True)
+sunaudio = test_support.import_module('sunaudio', deprecated=True)
 
 SND_FORMAT_MULAW_8 = 1
@@ -61 +62 @@
             self.dev.setparameters(-1, size, nchannels, fmt)
         except ValueError, err:
-            self.assertEquals(err.args[0], "expected rate >= 0, not -1")
+            self.assertEqual(err.args[0], "expected rate >= 0, not -1")
         try:
             self.dev.setparameters(rate, -2, nchannels, fmt)
         except ValueError, err:
-            self.assertEquals(err.args[0], "expected sample size >= 0, not -2")
+            self.assertEqual(err.args[0], "expected sample size >= 0, not -2")
         try:
             self.dev.setparameters(rate, size, 3, fmt)
         except ValueError, err:
-            self.assertEquals(err.args[0], "nchannels must be 1 or 2, not 3")
+            self.assertEqual(err.args[0], "nchannels must be 1 or 2, not 3")
         try:
             self.dev.setparameters(rate, size, nchannels, 177)
         except ValueError, err:
-            self.assertEquals(err.args[0], "unknown audio encoding: 177")
+            self.assertEqual(err.args[0], "unknown audio encoding: 177")
         try:
             self.dev.setparameters(rate, size, nchannels, linuxaudiodev.AFMT_U16_LE)
         except ValueError, err:
-            self.assertEquals(err.args[0], "for linear unsigned 16-bit little-endian "
-                              "audio, expected sample size 16, not 8")
+            self.assertEqual(err.args[0], "for linear unsigned 16-bit little-endian "
+                             "audio, expected sample size 16, not 8")
         try:
             self.dev.setparameters(rate, 16, nchannels, fmt)
         except ValueError, err:
-            self.assertEquals(err.args[0], "for linear unsigned 8-bit audio, expected "
-                              "sample size 8, not 16")
+            self.assertEqual(err.args[0], "for linear unsigned 8-bit audio, expected "
+                             "sample size 8, not 16")
 
 def test_main():
@@ -90 +91 @@
     except linuxaudiodev.error, msg:
         if msg.args[0] in (errno.EACCES, errno.ENOENT, errno.ENODEV, errno.EBUSY):
-            raise TestSkipped(msg)
+            raise unittest.SkipTest(msg)
         raise
     dsp.close()