From 81e92e582e06481f37a7ce1d23bd251316c58383 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Mon, 3 Nov 2008 22:34:57 +0000 Subject: [PATCH] move a FileIO test to test_fileio --- Lib/test/test_fileio.py | 10 +++++++++- Lib/test/test_io.py | 7 ------- 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, -- 2.50.1