Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
e1121537
Commit
e1121537
authored
Mar 21, 2012
by
R David Murray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#12757: Make doctest skipping in -OO mode work with unittest/regrtest -v
parent
0f71f441
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
Lib/doctest.py
Lib/doctest.py
+7
-3
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/doctest.py
View file @
e1121537
...
@@ -2266,7 +2266,8 @@ class DocTestCase(unittest.TestCase):
...
@@ -2266,7 +2266,8 @@ class DocTestCase(unittest.TestCase):
return
"Doctest: "
+
self
.
_dt_test
.
name
return
"Doctest: "
+
self
.
_dt_test
.
name
class
SkipDocTestCase
(
DocTestCase
):
class
SkipDocTestCase
(
DocTestCase
):
def
__init__
(
self
):
def
__init__
(
self
,
module
):
self
.
module
=
module
DocTestCase
.
__init__
(
self
,
None
)
DocTestCase
.
__init__
(
self
,
None
)
def
setUp
(
self
):
def
setUp
(
self
):
...
@@ -2276,7 +2277,10 @@ class SkipDocTestCase(DocTestCase):
...
@@ -2276,7 +2277,10 @@ class SkipDocTestCase(DocTestCase):
pass
pass
def
shortDescription
(
self
):
def
shortDescription
(
self
):
return
"Skipping tests from %s"
%
module
.
__name__
return
"Skipping tests from %s"
%
self
.
module
.
__name__
__str__
=
shortDescription
def
DocTestSuite
(
module
=
None
,
globs
=
None
,
extraglobs
=
None
,
test_finder
=
None
,
def
DocTestSuite
(
module
=
None
,
globs
=
None
,
extraglobs
=
None
,
test_finder
=
None
,
**
options
):
**
options
):
...
@@ -2324,7 +2328,7 @@ def DocTestSuite(module=None, globs=None, extraglobs=None, test_finder=None,
...
@@ -2324,7 +2328,7 @@ def DocTestSuite(module=None, globs=None, extraglobs=None, test_finder=None,
if
not
tests
and
sys
.
flags
.
optimize
>=
2
:
if
not
tests
and
sys
.
flags
.
optimize
>=
2
:
# Skip doctests when running with -O2
# Skip doctests when running with -O2
suite
=
unittest
.
TestSuite
()
suite
=
unittest
.
TestSuite
()
suite
.
addTest
(
SkipDocTestCase
())
suite
.
addTest
(
SkipDocTestCase
(
module
))
return
suite
return
suite
elif
not
tests
:
elif
not
tests
:
# Why do we want to do this? Because it reveals a bug that might
# Why do we want to do this? Because it reveals a bug that might
...
...
Misc/NEWS
View file @
e1121537
...
@@ -28,6 +28,9 @@ Core and Builtins
...
@@ -28,6 +28,9 @@ Core and Builtins
Library
Library
-------
-------
- Issue #12757: Fix the skipping of doctests when python is run with -OO so
that it works in unittest's verbose mode as well as non-verbose mode.
- Issue #3573: IDLE hangs when passing invalid command line args
- Issue #3573: IDLE hangs when passing invalid command line args
(directory(ies) instead of file(s)) (Patch by Guilherme Polo)
(directory(ies) instead of file(s)) (Patch by Guilherme Polo)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment