fix tests for autodoc novalue option

In the tests for autodoc the Options are of type struct,
while in the code there is a special autodoc.Options class,
which is a dict.

So "novalue" in self.options doesn't work,
but self.options.novalue does work for both.

Additionally the logic for autoattribute was wrong and is fixed now.

sphinx/ext/autodoc.py

@@ -1106,7 +1106,7 @@ class DataDocumenter(ModuleLevelDocumenter):
 
     def add_directive_header(self, sig):
         ModuleLevelDocumenter.add_directive_header(self, sig)
-        if not "novalue" in self.options:
+        if not self.options.novalue:
             try:
                 objrepr = safe_repr(self.object)
             except ValueError:
@@ -1221,7 +1221,7 @@ class AttributeDocumenter(ClassLevelDocumenter):
 
     def add_directive_header(self, sig):
         ClassLevelDocumenter.add_directive_header(self, sig)
-        if not self._datadescriptor or "novalue" in self.options:
+        if not self._datadescriptor and not self.options.novalue:
             try:
                 objrepr = safe_repr(self.object)
             except ValueError:

tests/test_autodoc.py

@@ -38,6 +38,7 @@ def setup_module():
         special_members = False,
         show_inheritance = False,
         noindex = False,
+        novalue = False,
         synopsis = '',
         platform = '',
         deprecated = False,