[Python-checkins] cpython (merge 3.3 -> default): #17303: merge with 3.3.
ezio.melotti
python-checkins at python.org
Wed Feb 27 09:01:25 CET 2013
http://hg.python.org/cpython/rev/5599bbc275bc
changeset: 82410:5599bbc275bc
parent: 82408:5aaf6bc1d502
parent: 82409:83ae10bf608c
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Wed Feb 27 10:01:06 2013 +0200
summary:
#17303: merge with 3.3.
files:
Lib/test/test_future.py | 24 +++++++++++-------------
Lib/test/test_future3.py | 6 +-----
Lib/test/test_future4.py | 6 +-----
Lib/test/test_future5.py | 4 ++--
Misc/NEWS | 3 +++
5 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/Lib/test/test_future.py b/Lib/test/test_future.py
--- a/Lib/test/test_future.py
+++ b/Lib/test/test_future.py
@@ -13,18 +13,18 @@
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 @@
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 @@
self.assertIsInstance(scope["x"], str)
-def test_main():
- support.run_unittest(FutureTest)
if __name__ == "__main__":
- test_main()
+ unittest.main()
diff --git a/Lib/test/test_future3.py b/Lib/test/test_future3.py
--- a/Lib/test/test_future3.py
+++ b/Lib/test/test_future3.py
@@ -2,7 +2,6 @@
from __future__ import division
import unittest
-from test import support
x = 2
def nester():
@@ -23,8 +22,5 @@
def test_nested_scopes(self):
self.assertEqual(nester(), 3)
-def test_main():
- support.run_unittest(TestFuture)
-
if __name__ == "__main__":
- test_main()
+ unittest.main()
diff --git a/Lib/test/test_future4.py b/Lib/test/test_future4.py
--- a/Lib/test/test_future4.py
+++ b/Lib/test/test_future4.py
@@ -1,10 +1,6 @@
from __future__ import unicode_literals
import unittest
-from test import support
-
-def test_main():
- pass
if __name__ == "__main__":
- test_main()
+ unittest.main()
diff --git a/Lib/test/test_future5.py b/Lib/test/test_future5.py
--- a/Lib/test/test_future5.py
+++ b/Lib/test/test_future5.py
@@ -17,5 +17,5 @@
self.assertEqual(s.getvalue(), "foo\n")
-def test_main():
- support.run_unittest(TestMultipleFeatures)
+if __name__ == '__main__':
+ unittest.main()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -893,6 +893,9 @@
- Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host.
+- 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.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list