diff options
author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-05-25 20:47:16 (GMT) |
---|---|---|
committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-05-25 20:47:16 (GMT) |
commit | a80987f20d0c73532127e1c3f69f7983c5c443d2 (patch) | |
tree | 7747598f8d947aada125c326de1940792ae69d39 /Lib/test | |
parent | b79f28ccbd0cde0580a8d7198ac62e97e7cfb4c4 (diff) | |
download | cpython-a80987f20d0c73532127e1c3f69f7983c5c443d2.zip cpython-a80987f20d0c73532127e1c3f69f7983c5c443d2.tar.gz cpython-a80987f20d0c73532127e1c3f69f7983c5c443d2.tar.bz2 |
Issue #12175: RawIOBase.readall() now returns None if read() returns None.
Diffstat (limited to 'Lib/test')
-rw-r--r-- | Lib/test/test_io.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index 109c82d..5333bb6 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -790,14 +790,17 @@ class BufferedReaderTest(unittest.TestCase, CommonBufferedTests): # Inject some None's in there to simulate EWOULDBLOCK rawio = self.MockRawIO((b"abc", b"d", None, b"efg", None, None, None)) bufio = self.tp(rawio) - self.assertEqual(b"abcd", bufio.read(6)) self.assertEqual(b"e", bufio.read(1)) self.assertEqual(b"fg", bufio.read()) self.assertEqual(b"", bufio.peek(1)) - self.assertTrue(None is bufio.read()) + self.assertIsNone(bufio.read()) self.assertEqual(b"", bufio.read()) + rawio = self.MockRawIO((b"a", None, None)) + self.assertEqual(b"a", rawio.readall()) + self.assertIsNone(rawio.readall()) + def test_read_past_eof(self): rawio = self.MockRawIO((b"abc", b"d", b"efg")) bufio = self.tp(rawio) |