summaryrefslogtreecommitdiff
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-11-03 22:34:57 +0000
committerBenjamin Peterson <benjamin@python.org>2008-11-03 22:34:57 +0000
commit81e92e582e06481f37a7ce1d23bd251316c58383 (patch)
tree2ad4c9bf2a4d9c300f4b17ae5c095dd66a156378 /Lib
parentaccb38c74fb66ab6cfbfd35af05892efb1946d08 (diff)
downloadcpython-git-81e92e582e06481f37a7ce1d23bd251316c58383.tar.gz
move a FileIO test to test_fileio
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_fileio.py10
-rw-r--r--Lib/test/test_io.py7
2 files changed, 9 insertions, 8 deletions
diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py
index 5a0e1a6b34..cbc7165707 100644
--- a/Lib/test/test_fileio.py
+++ b/Lib/test/test_fileio.py
@@ -7,7 +7,7 @@ import unittest
from array import array
from weakref import proxy
-from test.test_support import TESTFN, findfile, run_unittest
+from test.test_support import TESTFN, findfile, check_warnings, run_unittest
from UserList import UserList
import _fileio
@@ -241,6 +241,14 @@ class OtherFileTests(unittest.TestCase):
def testInvalidInit(self):
self.assertRaises(TypeError, _fileio._FileIO, "1", 0, 0)
+ def testWarnings(self):
+ with check_warnings() as w:
+ self.assertEqual(w.warnings, [])
+ self.assertRaises(TypeError, _fileio._FileIO, [])
+ self.assertEqual(w.warnings, [])
+ self.assertRaises(ValueError, _fileio._FileIO, "/some/invalid/name", "rt")
+ self.assertEqual(w.warnings, [])
+
def test_main():
# Historically, these tests have been sloppy about removing TESTFN.
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index 08a524fa99..9ef2a818b3 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -1236,13 +1236,6 @@ class MiscIOTest(unittest.TestCase):
else:
self.assert_(issubclass(obj, io.IOBase))
- def test_fileio_warnings(self):
- with test_support.check_warnings() as w:
- self.assertEqual(w.warnings, [])
- self.assertRaises(TypeError, io.FileIO, [])
- self.assertEqual(w.warnings, [])
- self.assertRaises(ValueError, io.FileIO, "/some/invalid/name", "rt")
- self.assertEqual(w.warnings, [])
def test_main():
test_support.run_unittest(IOTest, BytesIOTest, StringIOTest,