summaryrefslogtreecommitdiff
path: root/tests/test_autodoc.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test_autodoc.py')
-rw-r--r--tests/test_autodoc.py14
1 files changed, 12 insertions, 2 deletions
diff --git a/tests/test_autodoc.py b/tests/test_autodoc.py
index d2ba95608..8df943ec7 100644
--- a/tests/test_autodoc.py
+++ b/tests/test_autodoc.py
@@ -15,7 +15,7 @@ from util import TestApp, Struct, raises, SkipTest # NOQA
from nose.tools import with_setup, eq_
import enum
-from six import StringIO
+from six import StringIO, add_metaclass
from docutils.statemachine import ViewList
from sphinx.ext.autodoc import AutoDirective, add_documenter, \
@@ -847,11 +847,13 @@ def test_generate():
del directive.env.temp_data['autodoc:module']
# test descriptor class documentation
- options.members = ['CustomDataDescriptor']
+ options.members = ['CustomDataDescriptor', 'CustomDataDescriptor2']
assert_result_contains('.. py:class:: CustomDataDescriptor(doc)',
'module', 'test_autodoc')
assert_result_contains(' .. py:method:: CustomDataDescriptor.meth()',
'module', 'test_autodoc')
+ assert_result_contains('.. py:class:: CustomDataDescriptor2(doc)',
+ 'module', 'test_autodoc')
# test mocked module imports
options.members = ['TestAutodoc']
@@ -894,6 +896,14 @@ class CustomDataDescriptor(object):
return "The Answer"
+class CustomDataDescriptorMeta(type):
+ """Descriptor metaclass docstring."""
+
+@add_metaclass(CustomDataDescriptorMeta)
+class CustomDataDescriptor2(CustomDataDescriptor):
+ """Descriptor class with custom metaclass docstring."""
+
+
def _funky_classmethod(name, b, c, d, docstring=None):
"""Generates a classmethod for a class from a template by filling out
some arguments."""