summaryrefslogtreecommitdiff
path: root/tests/test_autodoc.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-02-21 23:20:26 +0100
committerGeorg Brandl <georg@python.org>2010-02-21 23:20:26 +0100
commitcee7e4ba3bcf34aab0c41f0172ade87952fefbf1 (patch)
tree4abf0a2814396cb786fbb3ca7e384c2e8147bbc4 /tests/test_autodoc.py
parentfab92b215afa61ffa17a12919a3bd5192adba754 (diff)
parent686824997dffd30b689f0abc5f3df8997149acc4 (diff)
downloadsphinx-git-cee7e4ba3bcf34aab0c41f0172ade87952fefbf1.tar.gz
merge with 0.6
Diffstat (limited to 'tests/test_autodoc.py')
-rw-r--r--tests/test_autodoc.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/test_autodoc.py b/tests/test_autodoc.py
index b505b06ae..58bdfaef4 100644
--- a/tests/test_autodoc.py
+++ b/tests/test_autodoc.py
@@ -169,8 +169,9 @@ def test_format_signature():
assert formatsig('method', 'H.foo', H.foo1, 'a', None) == '(a)'
assert formatsig('method', 'H.foo', H.foo2, None, None) == '(b, *c)'
- # test exception handling
- raises(TypeError, formatsig, 'function', 'int', int, None, None)
+ # test exception handling (exception is caught and args is '')
+ assert formatsig('function', 'int', int, None, None) == ''
+ del _warnings[:]
# test processing by event handler
assert formatsig('method', 'bar', H.foo1, None, None) == '42'