[Python-checkins] cpython (merge 3.3 -> default): Make test_audioop discoverable by unittest.

[serhiy.storchaka]

http://hg.python.org/cpython/rev/34986f55a32d
changeset:   86514:34986f55a32d
parent:      86512:0c48fe975c54
parent:      86513:849ed3ea215b
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Sun Oct 20 17:25:34 2013 +0300
summary:
  Make test_audioop discoverable by unittest.

files:
  Lib/test/test_audioop.py |  6 +-----
  1 files changed, 1 insertions(+), 5 deletions(-)


diff --git a/Lib/test/test_audioop.py b/Lib/test/test_audioop.py
--- a/Lib/test/test_audioop.py
+++ b/Lib/test/test_audioop.py
@@ -1,7 +1,6 @@
 import audioop
 import sys
 import unittest
-from test.support import run_unittest
 
 def pack(width, data):
     return b''.join(v.to_bytes(width, sys.byteorder, signed=True) for v in data)
@@ -415,8 +414,5 @@
             self.assertRaises(audioop.error, audioop.alaw2lin, data, size)
             self.assertRaises(audioop.error, audioop.adpcm2lin, data, size, state)
 
-def test_main():
-    run_unittest(TestAudioop)
-
 if __name__ == '__main__':
-    test_main()
+    unittest.main()

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