diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2010-02-24 01:46:21 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2010-02-24 01:46:21 (GMT) |
| commit | 378c0cf5abb4c49c1a95597d3c5284dc93dd7822 (patch) | |
| tree | 0a7c9a724887dff98a5abefd9b09da0de6889731 /Lib/test/test_descr.py | |
| parent | 72aee3dcabf98a0b8a7a60cccab4fbd1ef63fbd2 (diff) | |
| download | cpython-378c0cf5abb4c49c1a95597d3c5284dc93dd7822.zip cpython-378c0cf5abb4c49c1a95597d3c5284dc93dd7822.tar.gz cpython-378c0cf5abb4c49c1a95597d3c5284dc93dd7822.tar.bz2 | |
Merged revisions 78351 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78351 | r.david.murray | 2010-02-22 19:24:49 -0500 (Mon, 22 Feb 2010) | 5 lines
Issue 6292: for the moment at least, the test suite passes if run
with -OO. Tests requiring docstrings are skipped. Patch by
Brian Curtin, thanks to Matias Torchinsky for helping review and
improve the patch.
........
Diffstat (limited to 'Lib/test/test_descr.py')
| -rw-r--r-- | Lib/test/test_descr.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index 93c4a19..95a68c0 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -1817,6 +1817,9 @@ order (MRO) for bases """ else: self.fail("expected ZeroDivisionError from bad property") + @unittest.skipIf(sys.flags.optimize >= 2, + "Docstrings are omitted with -O2 and above") + def test_properties_doc_attrib(self): class E(object): def getter(self): "getter method" @@ -1829,6 +1832,7 @@ order (MRO) for bases """ prop2 = property(fset=setter) self.assertEqual(prop2.__doc__, None) + def test_testcapi_no_segfault(self): # this segfaulted in 2.5b2 try: import _testcapi |