mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

#17163: test_file now works with unittest test discovery. Patch by Zachary Ware.

Browse source
This commit is contained in:
Ezio Melotti 2013-02-15 19:17:53 +02:00
parent a90b7132b7
commit 3a03d2eaef
2 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Lib/test/test_file.py
View file

@ -10,7 +10,7 @@ import _pyio as pyio
from test.support import TESTFN, run_unittest from test.support import TESTFN, run_unittest
from collections import UserList from collections import UserList
class AutoFileTests(unittest.TestCase): class AutoFileTests:
# file tests for which a test file is automatically set up # file tests for which a test file is automatically set up
def setUp(self): def setUp(self):
@ -128,14 +128,14 @@ class AutoFileTests(unittest.TestCase):
def testReadWhenWriting(self): def testReadWhenWriting(self):
self.assertRaises(IOError, self.f.read) self.assertRaises(IOError, self.f.read)
class CAutoFileTests(AutoFileTests): class CAutoFileTests(AutoFileTests, unittest.TestCase):
open = io.open open = io.open
class PyAutoFileTests(AutoFileTests): class PyAutoFileTests(AutoFileTests, unittest.TestCase):
open = staticmethod(pyio.open) open = staticmethod(pyio.open)
class OtherFileTests(unittest.TestCase): class OtherFileTests:
def testModeStrings(self): def testModeStrings(self):
# check invalid mode strings # check invalid mode strings
@ -322,22 +322,18 @@ class OtherFileTests(unittest.TestCase):
finally: finally:
os.unlink(TESTFN) os.unlink(TESTFN)
class COtherFileTests(OtherFileTests): class COtherFileTests(OtherFileTests, unittest.TestCase):
open = io.open open = io.open
class PyOtherFileTests(OtherFileTests): class PyOtherFileTests(OtherFileTests, unittest.TestCase):
open = staticmethod(pyio.open) open = staticmethod(pyio.open)
def test_main(): def tearDownModule():
# Historically, these tests have been sloppy about removing TESTFN. # Historically, these tests have been sloppy about removing TESTFN.
# So get rid of it no matter what. # So get rid of it no matter what.
try: if os.path.exists(TESTFN):
run_unittest(CAutoFileTests, PyAutoFileTests, os.unlink(TESTFN)
COtherFileTests, PyOtherFileTests)
finally:
if os.path.exists(TESTFN):
os.unlink(TESTFN)
if __name__ == '__main__': if __name__ == '__main__':
test_main() unittest.main()

3
Misc/NEWS
View file

@ -605,6 +605,9 @@ Tests
- Issue #15539: Added regression tests for Tools/scripts/pindent.py. - Issue #15539: Added regression tests for Tools/scripts/pindent.py.
- Issue #17163: test_file now works with unittest test discovery.
Patch by Zachary Ware.
- Issue #16925: test_configparser now works with unittest test discovery. - Issue #16925: test_configparser now works with unittest test discovery.
Patch by Zachary Ware. Patch by Zachary Ware.