Issue #19535: Fixed test_docxmlrpc, test_functools, test_inspect, and

test_statistics when python is run with -OO.
This commit is contained in:
Serhiy Storchaka 2013-12-08 18:16:18 +02:00
commit b12cb6a550
5 changed files with 14 additions and 4 deletions

View file

@ -202,10 +202,12 @@ class DocXMLRPCHTTPGETServer(unittest.TestCase):
""" Test that annotations works as expected """ """ Test that annotations works as expected """
self.client.request("GET", "/") self.client.request("GET", "/")
response = self.client.getresponse() response = self.client.getresponse()
docstring = (b'' if sys.flags.optimize >= 2 else
b'<dd><tt>Use&nbsp;function&nbsp;annotations.</tt></dd>')
self.assertIn( self.assertIn(
(b'<dl><dt><a name="-annotation"><strong>annotation</strong></a>' (b'<dl><dt><a name="-annotation"><strong>annotation</strong></a>'
b'(x: int)</dt><dd><tt>Use&nbsp;function&nbsp;annotations.</tt>' b'(x: int)</dt>' + docstring + b'</dl>\n'
b'</dd></dl>\n<dl><dt><a name="-method_annotation"><strong>' b'<dl><dt><a name="-method_annotation"><strong>'
b'method_annotation</strong></a>(x: bytes)</dt></dl>'), b'method_annotation</strong></a>(x: bytes)</dt></dl>'),
response.read()) response.read())

View file

@ -1126,7 +1126,8 @@ class TestSingleDispatch(unittest.TestCase):
"Simple test" "Simple test"
return "Test" return "Test"
self.assertEqual(g.__name__, "g") self.assertEqual(g.__name__, "g")
self.assertEqual(g.__doc__, "Simple test") if sys.flags.optimize < 2:
self.assertEqual(g.__doc__, "Simple test")
@unittest.skipUnless(decimal, 'requires _decimal') @unittest.skipUnless(decimal, 'requires _decimal')
@support.cpython_only @support.cpython_only

View file

@ -2529,7 +2529,8 @@ class TestMain(unittest.TestCase):
# Just a quick sanity check on the output # Just a quick sanity check on the output
self.assertIn(module.__name__, output) self.assertIn(module.__name__, output)
self.assertIn(module.__file__, output) self.assertIn(module.__file__, output)
self.assertIn(module.__cached__, output) if not sys.flags.optimize:
self.assertIn(module.__cached__, output)
self.assertEqual(err, b'') self.assertEqual(err, b'')

View file

@ -8,6 +8,7 @@ import decimal
import doctest import doctest
import math import math
import random import random
import sys
import types import types
import unittest import unittest
@ -625,6 +626,8 @@ class GlobalsTest(unittest.TestCase):
class DocTests(unittest.TestCase): class DocTests(unittest.TestCase):
@unittest.skipIf(sys.flags.optimize >= 2,
"Docstrings are omitted with -OO and above")
def test_doc_tests(self): def test_doc_tests(self):
failed, tried = doctest.testmod(statistics) failed, tried = doctest.testmod(statistics)
self.assertGreater(tried, 0) self.assertGreater(tried, 0)

View file

@ -112,6 +112,9 @@ Library
Tests Tests
----- -----
- Issue #19535: Fixed test_docxmlrpc, test_functools, test_inspect, and
test_statistics when python is run with -OO.
- Issue #19926: Removed unneeded test_main from test_abstract_numbers. - Issue #19926: Removed unneeded test_main from test_abstract_numbers.
Patch by Vajrasky Kok. Patch by Vajrasky Kok.