diff options
author | Martin Panter <vadmium> | 2015-09-07 04:04:40 +0000 |
---|---|---|
committer | Martin Panter <vadmium> | 2015-09-07 04:04:40 +0000 |
commit | 5c3283dced5fa4dbc5c7e03e0af0d861d19d55c3 (patch) | |
tree | a08852c71a58f00257e2e8a914beb41a0ccae050 /Lib/test/test_mmap.py | |
parent | 02ff0a3fa7037d14ff287f5641b9ccfa288990d6 (diff) | |
parent | 7558a98dd1ea68fd5514450c138265278aaeb414 (diff) | |
download | cpython-5c3283dced5fa4dbc5c7e03e0af0d861d19d55c3.tar.gz |
Issue #25004: Merge 3.4 into 3.5
Diffstat (limited to 'Lib/test/test_mmap.py')
-rw-r--r-- | Lib/test/test_mmap.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py index ad93a59383..0f25742c48 100644 --- a/Lib/test/test_mmap.py +++ b/Lib/test/test_mmap.py @@ -282,6 +282,7 @@ class MmapTests(unittest.TestCase): self.assertEqual(m.find(b'one', 1), 8) self.assertEqual(m.find(b'one', 1, -1), 8) self.assertEqual(m.find(b'one', 1, -2), -1) + self.assertEqual(m.find(bytearray(b'one')), 0) def test_rfind(self): @@ -300,6 +301,7 @@ class MmapTests(unittest.TestCase): self.assertEqual(m.rfind(b'one', 0, -2), 0) self.assertEqual(m.rfind(b'one', 1, -1), 8) self.assertEqual(m.rfind(b'one', 1, -2), -1) + self.assertEqual(m.rfind(bytearray(b'one')), 8) def test_double_close(self): @@ -601,8 +603,10 @@ class MmapTests(unittest.TestCase): m.write(b"bar") self.assertEqual(m.tell(), 6) self.assertEqual(m[:], b"012bar6789") - m.seek(8) - self.assertRaises(ValueError, m.write, b"bar") + m.write(bytearray(b"baz")) + self.assertEqual(m.tell(), 9) + self.assertEqual(m[:], b"012barbaz9") + self.assertRaises(ValueError, m.write, b"ba") def test_non_ascii_byte(self): for b in (129, 200, 255): # > 128 |