[Python-checkins] cpython (merge 3.2 -> 3.3): Fix skip conditions in some docstings tests.
serhiy.storchaka
python-checkins at python.org
Mon Jan 28 12:29:38 CET 2013
http://hg.python.org/cpython/rev/1a6cb184e939
changeset: 81792:1a6cb184e939
branch: 3.3
parent: 81782:b2fa459d95d6
parent: 81791:d4bdd6ec4594
user: Serhiy Storchaka <storchaka at gmail.com>
date: Mon Jan 28 13:26:25 2013 +0200
summary:
Fix skip conditions in some docstings tests.
files:
Lib/test/test_functools.py | 2 +-
Lib/test/test_property.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py
--- a/Lib/test/test_functools.py
+++ b/Lib/test/test_functools.py
@@ -321,7 +321,7 @@
self.assertEqual(wrapper.__qualname__, f.__qualname__)
self.assertEqual(wrapper.attr, 'This is also a test')
- @unittest.skipIf(not sys.flags.optimize <= 1,
+ @unittest.skipIf(sys.flags.optimize >= 2,
"Docstrings are omitted with -O2 and above")
def test_default_update_doc(self):
wrapper, _ = self._default_update()
diff --git a/Lib/test/test_property.py b/Lib/test/test_property.py
--- a/Lib/test/test_property.py
+++ b/Lib/test/test_property.py
@@ -186,7 +186,7 @@
Foo.spam.__doc__,
"spam wrapped in property subclass")
- @unittest.skipIf(sys.flags.optimize <= 2,
+ @unittest.skipIf(sys.flags.optimize >= 2,
"Docstrings are omitted with -O2 and above")
def test_property_setter_copies_getter_docstring(self):
class Foo(object):
@@ -219,7 +219,7 @@
FooSub.spam.__doc__,
"spam wrapped in property subclass")
- @unittest.skipIf(sys.flags.optimize <= 2,
+ @unittest.skipIf(sys.flags.optimize >= 2,
"Docstrings are omitted with -O2 and above")
def test_property_new_getter_new_docstring(self):
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list