Fix skip conditions in some docstings tests.

diff --cc Lib/test/test_functools.py
index 47b3df80d4b834c911d55936a508e04bbb0bed82,4708381f3f9e2a14807c4a922c5ab8bd87e3b827..35e39b528fd2a7da4e0849b76db52e6c4b3f296e
--- 1/Lib/test/test_functools.py
--- 2/Lib/test/test_functools.py
+++ b/Lib/test/test_functools.py
@@@ -313,18 -310,17 +313,18 @@@ class TestWraps(TestUpdateWrapper)
          def wrapper():
              pass
          self.check_wrapper(wrapper, f)
 -        return wrapper
 +        return wrapper, f
  
      def test_default_update(self):
 -        wrapper = self._default_update()
 +        wrapper, f = self._default_update()
          self.assertEqual(wrapper.__name__, 'f')
 +        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()
 +        wrapper, _ = self._default_update()
          self.assertEqual(wrapper.__doc__, 'This is a test')
  
      def test_no_update(self):

diff --cc Lib/test/test_property.py
Simple merge