diff options
| author | Ethan Furman <ethan@stoneleaf.us> | 2013-10-22 07:30:24 -0700 |
|---|---|---|
| committer | Ethan Furman <ethan@stoneleaf.us> | 2013-10-22 07:30:24 -0700 |
| commit | 3f2f19230c8654461dfbcb68186babfb80d33ccc (patch) | |
| tree | db6f5c8e224be7eb516c2abb822da7cc294dc598 /Lib/test/test_pydoc.py | |
| parent | 327dd732ce2b7df001b0a052e3464c85f0c85128 (diff) | |
| download | cpython-git-3f2f19230c8654461dfbcb68186babfb80d33ccc.tar.gz | |
Issue #19030: fix new pydoc tests for --without-doc-strings
Diffstat (limited to 'Lib/test/test_pydoc.py')
| -rw-r--r-- | Lib/test/test_pydoc.py | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py index 87e3e42b7b..2d101aa2f5 100644 --- a/Lib/test/test_pydoc.py +++ b/Lib/test/test_pydoc.py @@ -215,11 +215,9 @@ Help on class DA in module %s: class DA(builtins.object) | Data descriptors defined here: |\x20\x20 - | __dict__ - | dictionary for instance variables (if defined) + | __dict__%s |\x20\x20 - | __weakref__ - | list of weak references to the object (if defined) + | __weakref__%s |\x20\x20 | ham |\x20\x20 @@ -709,6 +707,10 @@ class TestHelper(unittest.TestCase): sorted(keyword.kwlist)) class PydocWithMetaClasses(unittest.TestCase): + @unittest.skipIf(sys.flags.optimize >= 2, + "Docstrings are omitted with -O2 and above") + @unittest.skipIf(hasattr(sys, 'gettrace') and sys.gettrace(), + 'trace function introduces __locals__ unexpectedly') def test_DynamicClassAttribute(self): class Meta(type): def __getattr__(self, name): @@ -719,15 +721,22 @@ class PydocWithMetaClasses(unittest.TestCase): @types.DynamicClassAttribute def ham(self): return 'eggs' + expected_text_data_docstrings = tuple('\n | ' + s if s else '' + for s in expected_data_docstrings) output = StringIO() helper = pydoc.Helper(output=output) helper(DA) - expected_text = expected_dynamicattribute_pattern % __name__ + expected_text = expected_dynamicattribute_pattern % ( + (__name__,) + expected_text_data_docstrings[:2]) result = output.getvalue().strip() if result != expected_text: print_diffs(expected_text, result) self.fail("outputs are not equal, see diff above") + @unittest.skipIf(sys.flags.optimize >= 2, + "Docstrings are omitted with -O2 and above") + @unittest.skipIf(hasattr(sys, 'gettrace') and sys.gettrace(), + 'trace function introduces __locals__ unexpectedly') def test_virtualClassAttributeWithOneMeta(self): class Meta(type): def __dir__(cls): @@ -747,6 +756,10 @@ class PydocWithMetaClasses(unittest.TestCase): print_diffs(expected_text, result) self.fail("outputs are not equal, see diff above") + @unittest.skipIf(sys.flags.optimize >= 2, + "Docstrings are omitted with -O2 and above") + @unittest.skipIf(hasattr(sys, 'gettrace') and sys.gettrace(), + 'trace function introduces __locals__ unexpectedly') def test_virtualClassAttributeWithTwoMeta(self): class Meta1(type): def __dir__(cls): @@ -795,6 +808,10 @@ class PydocWithMetaClasses(unittest.TestCase): if fail1 or fail2: self.fail("outputs are not equal, see diff above") + @unittest.skipIf(sys.flags.optimize >= 2, + "Docstrings are omitted with -O2 and above") + @unittest.skipIf(hasattr(sys, 'gettrace') and sys.gettrace(), + 'trace function introduces __locals__ unexpectedly') def test_buggy_dir(self): class M(type): def __dir__(cls): |