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
468b6807
Commit
468b6807
authored
Feb 27, 2013
by
Ezio Melotti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#17303: test_future* now work with unittest test discovery. Patch by Zachary Ware.
parent
96b7f2c9
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
25 deletions
+18
-25
Lib/test/test_future.py
Lib/test/test_future.py
+11
-13
Lib/test/test_future3.py
Lib/test/test_future3.py
+1
-5
Lib/test/test_future4.py
Lib/test/test_future4.py
+1
-5
Lib/test/test_future5.py
Lib/test/test_future5.py
+2
-2
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/test/test_future.py
View file @
468b6807
...
...
@@ -13,18 +13,18 @@ def get_error_location(msg):
class FutureTest(unittest.TestCase):
def test_future1(self):
support.unload('
future_test1
')
from test import future_test1
self.assertEqual(future_test1.result, 6)
with support.CleanImport('
future_test1
'):
from test import future_test1
self.assertEqual(future_test1.result, 6)
def test_future2(self):
support.unload('
future_test2
')
from test import future_test2
self.assertEqual(future_test2.result, 6)
with support.CleanImport('
future_test2
'):
from test import future_test2
self.assertEqual(future_test2.result, 6)
def test_future3(self):
support.unload('
test_future3
')
from test import test_future3
with support.CleanImport('
test_future3
'):
from test import test_future3
def test_badfuture3(self):
try:
...
...
@@ -103,8 +103,8 @@ class FutureTest(unittest.TestCase):
self.fail("syntax error didn'
t
occur
")
def test_multiple_features(self):
support.unload("
test
.
test_future5
")
from test import test_future5
with support.CleanImport("
test
.
test_future5
"):
from test import test_future5
def test_unicode_literals_exec(self):
scope = {}
...
...
@@ -112,8 +112,6 @@ class FutureTest(unittest.TestCase):
self.assertIsInstance(scope["
x
"], str)
def test_main():
support.run_unittest(FutureTest)
if __name__ == "
__main__
":
test_
main()
unittest.
main()
Lib/test/test_future3.py
View file @
468b6807
...
...
@@ -2,7 +2,6 @@ from __future__ import nested_scopes
from
__future__
import
division
import
unittest
from
test
import
support
x
=
2
def
nester
():
...
...
@@ -23,8 +22,5 @@ class TestFuture(unittest.TestCase):
def
test_nested_scopes
(
self
):
self
.
assertEqual
(
nester
(),
3
)
def
test_main
():
support
.
run_unittest
(
TestFuture
)
if
__name__
==
"__main__"
:
test_
main
()
unittest
.
main
()
Lib/test/test_future4.py
View file @
468b6807
from
__future__
import
unicode_literals
import
unittest
from
test
import
support
def
test_main
():
pass
if
__name__
==
"__main__"
:
test_
main
()
unittest
.
main
()
Lib/test/test_future5.py
View file @
468b6807
...
...
@@ -17,5 +17,5 @@ class TestMultipleFeatures(unittest.TestCase):
self
.
assertEqual
(
s
.
getvalue
(),
"foo
\
n
"
)
def
test_main
()
:
support
.
run_unittest
(
TestMultipleFeatures
)
if
__name__
==
'__main__'
:
unittest
.
main
(
)
Misc/NEWS
View file @
468b6807
...
...
@@ -644,6 +644,9 @@ Tests
- Issue #15539: Added regression tests for Tools/scripts/pindent.py.
- Issue #17303: test_future* now work with unittest test discovery.
Patch by Zachary Ware.
- Issue #17163: test_file now works with unittest test discovery.
Patch by Zachary Ware.
...
...
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