summaryrefslogtreecommitdiff
path: root/Lib/test/test_audioop.py
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2008-03-03 19:15:45 +0000
committerChristian Heimes <christian@cheimes.de>2008-03-03 19:15:45 +0000
commite643d956f8106221acba0ae52ea5ecc890d93a15 (patch)
treedf5ff19f47434f5ad2b388b6020a5d6efba6a547 /Lib/test/test_audioop.py
parent30665b9a3adaf8e7e97b400e9c7c3063f8336c94 (diff)
downloadcpython-e643d956f8106221acba0ae52ea5ecc890d93a15.tar.gz
Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines Refactor test_logging to use unittest. This should finally solve the flakiness issues. Thanks to Antoine Pitrou for the patch. ........ r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in ceval.c. This is worth about a .03-.04us speedup on a simple with block. ........ r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines Move test_largefile over to using 'with' statements for open files. Also rename the driver function to test_main() instead of main_test(). ........ r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines Add a note in the main test class' docstring that the order of execution of the tests is important. ........ r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines Add a note in the main test class' docstring that the order of execution of the tests is important. ........ r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines Add test_main() functions to various tests where it was simple to do. Done so that regrtest can execute the test_main() directly instead of relying on import side-effects. ........ r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line Only DECREF if ret != NULL ........
Diffstat (limited to 'Lib/test/test_audioop.py')
-rw-r--r--Lib/test/test_audioop.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/Lib/test/test_audioop.py b/Lib/test/test_audioop.py
index ffb1cd58d9..ab8be02d8b 100644
--- a/Lib/test/test_audioop.py
+++ b/Lib/test/test_audioop.py
@@ -271,7 +271,7 @@ def testone(name, data):
if not rv:
print('Test FAILED for audioop.'+name+'()')
-def testall():
+def test_main():
data = [gendata1(), gendata2(), gendata4()]
names = dir(audioop)
# We know there is a routine 'add'
@@ -281,4 +281,8 @@ def testall():
routines.append(n)
for n in routines:
testone(n, data)
-testall()
+
+
+
+if __name__ == '__main__':
+ test_main()