mirror of
https://github.com/python/cpython.git
synced 2025-11-01 06:01:29 +00:00
Merged revisions 57392-57619 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r57395 | georg.brandl | 2007-08-24 19:23:23 +0200 (Fri, 24 Aug 2007) | 2 lines Bug #1011: fix rfc822.Message.getheader docs. ........ r57397 | georg.brandl | 2007-08-24 19:38:49 +0200 (Fri, 24 Aug 2007) | 2 lines Patch #1006: port test_winreg to unittest. ........ r57398 | georg.brandl | 2007-08-24 19:46:54 +0200 (Fri, 24 Aug 2007) | 2 lines Fix #1012: wrong URL to :mod:`site` in install/index.rst. ........ r57399 | georg.brandl | 2007-08-24 20:07:52 +0200 (Fri, 24 Aug 2007) | 2 lines Patch #1008: port test_signal to unittest. ........ r57400 | georg.brandl | 2007-08-24 20:22:54 +0200 (Fri, 24 Aug 2007) | 2 lines Port test_frozen to unittest. ........ r57401 | georg.brandl | 2007-08-24 20:27:43 +0200 (Fri, 24 Aug 2007) | 2 lines Document new utility functions in test_support. ........ r57402 | georg.brandl | 2007-08-24 20:30:06 +0200 (Fri, 24 Aug 2007) | 2 lines Remove test_rgbimg output file, there is no test_rgbimg.py. ........ r57403 | georg.brandl | 2007-08-24 20:35:27 +0200 (Fri, 24 Aug 2007) | 2 lines Remove output file for test_ossaudiodev, also properly close the dsp object. ........ r57404 | georg.brandl | 2007-08-24 20:46:27 +0200 (Fri, 24 Aug 2007) | 2 lines Convert test_linuxaudiodev to unittest. Fix a wrong finally clause in test_ossaudiodev. ........ r57406 | collin.winter | 2007-08-24 21:13:58 +0200 (Fri, 24 Aug 2007) | 1 line Convert test_pkg to use unittest. ........ r57408 | georg.brandl | 2007-08-24 21:22:34 +0200 (Fri, 24 Aug 2007) | 2 lines Catch the correct errors. ........ r57409 | georg.brandl | 2007-08-24 21:33:53 +0200 (Fri, 24 Aug 2007) | 2 lines Port test_class to unittest. Patch #1671298. ........ r57415 | collin.winter | 2007-08-24 23:09:42 +0200 (Fri, 24 Aug 2007) | 1 line Make test_structmembers pass when run with regrtests's -R flag. ........ r57455 | nick.coghlan | 2007-08-25 06:32:07 +0200 (Sat, 25 Aug 2007) | 1 line Revert misguided attempt at fixing incompatibility between -m and -i switches (better fix coming soon) ........ r57456 | nick.coghlan | 2007-08-25 06:35:54 +0200 (Sat, 25 Aug 2007) | 1 line Revert compile.c changes that shouldn't have been included in previous checkin ........ r57461 | nick.coghlan | 2007-08-25 12:50:41 +0200 (Sat, 25 Aug 2007) | 1 line Fix bug 1764407 - the -i switch now does the right thing when using the -m switch ........ r57464 | guido.van.rossum | 2007-08-25 17:08:43 +0200 (Sat, 25 Aug 2007) | 4 lines Server-side SSL and certificate validation, by Bill Janssen. While cleaning up Bill's C style, I may have cleaned up some code he didn't touch as well (in _ssl.c). ........ r57465 | neal.norwitz | 2007-08-25 18:41:36 +0200 (Sat, 25 Aug 2007) | 3 lines Try to get this to build with Visual Studio by moving all the variable declarations to the beginning of a scope. ........ r57466 | neal.norwitz | 2007-08-25 18:54:38 +0200 (Sat, 25 Aug 2007) | 1 line Fix test so it is skipped properly if there is no SSL support. ........ r57467 | neal.norwitz | 2007-08-25 18:58:09 +0200 (Sat, 25 Aug 2007) | 2 lines Fix a few more variables to try to get this to compile with Visual Studio. ........ r57473 | neal.norwitz | 2007-08-25 19:25:17 +0200 (Sat, 25 Aug 2007) | 1 line Try to get this test to pass for systems that do not have SO_REUSEPORT ........ r57482 | gregory.p.smith | 2007-08-26 02:26:00 +0200 (Sun, 26 Aug 2007) | 7 lines keep setup.py from listing unneeded hash modules (_md5, _sha*) as missing when they were not built because _hashlib with openssl provided their functionality instead. don't build bsddb185 if bsddb was built. ........ r57483 | neal.norwitz | 2007-08-26 03:08:16 +0200 (Sun, 26 Aug 2007) | 1 line Fix typo in docstring (missing c in reacquire) ........ r57484 | neal.norwitz | 2007-08-26 03:42:03 +0200 (Sun, 26 Aug 2007) | 2 lines Spell check (also americanify behaviour, it's almost 3 times as common) ........ r57503 | neal.norwitz | 2007-08-26 08:29:57 +0200 (Sun, 26 Aug 2007) | 4 lines Reap children before the test starts so hopefully SocketServer won't find any old children left around which causes an exception in collect_children() and the test to fail. ........ r57510 | neal.norwitz | 2007-08-26 20:50:39 +0200 (Sun, 26 Aug 2007) | 1 line Fail gracefully if the cert files cannot be created ........ r57513 | guido.van.rossum | 2007-08-26 21:35:09 +0200 (Sun, 26 Aug 2007) | 4 lines Bill Janssen wrote: Here's a patch which makes test_ssl a better player in the buildbots environment. I deep-ended on "try-except-else" clauses. ........ r57518 | neal.norwitz | 2007-08-26 23:40:16 +0200 (Sun, 26 Aug 2007) | 1 line Get the test passing by commenting out some writes (should they be removed?) ........ r57522 | neal.norwitz | 2007-08-27 00:16:23 +0200 (Mon, 27 Aug 2007) | 3 lines Catch IOError for when the device file doesn't exist or the user doesn't have permission to write to the device. ........ r57524 | neal.norwitz | 2007-08-27 00:20:03 +0200 (Mon, 27 Aug 2007) | 5 lines Another patch from Bill Janssen that: 1) Fixes the bug that two class names are initial-lower-case. 2) Replaces the poll waiting for the server to become ready with a threading.Event signal. ........ r57536 | neal.norwitz | 2007-08-27 02:58:33 +0200 (Mon, 27 Aug 2007) | 1 line Stop using string.join (from the module) to ease upgrade to py3k ........ r57537 | neal.norwitz | 2007-08-27 03:03:18 +0200 (Mon, 27 Aug 2007) | 1 line Make a utility function for handling (printing) an error ........ r57538 | neal.norwitz | 2007-08-27 03:15:33 +0200 (Mon, 27 Aug 2007) | 4 lines If we can't create a certificate, print a warning, but don't fail the test. Modified patch from what Bill Janssen sent on python-3000. ........ r57539 | facundo.batista | 2007-08-27 03:15:34 +0200 (Mon, 27 Aug 2007) | 7 lines Ignore test failures caused by 'resource temporarily unavailable' exceptions raised in the test server thread, since SimpleXMLRPCServer does not gracefully handle them. Changed number of requests handled by tests server thread to one (was 2) because no tests require more than one request. [GSoC - Alan McIntyre] ........ r57561 | guido.van.rossum | 2007-08-27 19:19:42 +0200 (Mon, 27 Aug 2007) | 8 lines > Regardless, building a fixed test certificate and checking it in sounds like > the better option. Then the openssl command in the test code can be turned > into a comment describing how the test data was pregenerated. Here's a patch that does that. Bill ........ r57568 | guido.van.rossum | 2007-08-27 20:42:23 +0200 (Mon, 27 Aug 2007) | 26 lines > Some of the code sets the error string in this directly before > returning NULL, and other pieces of the code call PySSL_SetError, > which creates the error string. I think some of the places which set > the string directly probably shouldn't; instead, they should call > PySSL_SetError to cons up the error name directly from the err code. > However, PySSL_SetError only works after the construction of an ssl > object, which means it can't be used there... I'll take a longer look > at it and see if there's a reasonable fix. Here's a patch which addresses this. It also fixes the indentation in PySSL_SetError, bringing it into line with PEP 7, fixes a compile warning about one of the OpenSSL macros, and makes the namespace a bit more consistent. I've tested it on FC 7 and OS X 10.4. % ./python ./Lib/test/regrtest.py -R :1: -u all test_ssl test_ssl beginning 6 repetitions 123456 ...... 1 test OK. [29244 refs] % [GvR: slightly edited to enforce 79-char line length, even if it required violating the style guide.] ........ r57570 | guido.van.rossum | 2007-08-27 21:11:11 +0200 (Mon, 27 Aug 2007) | 2 lines Patch 10124 by Bill Janssen, docs for the new ssl code. ........ r57574 | guido.van.rossum | 2007-08-27 22:51:00 +0200 (Mon, 27 Aug 2007) | 3 lines Patch # 1739906 by Christian Heimes -- add reduce to functools (importing it from __builtin__). ........ r57575 | guido.van.rossum | 2007-08-27 22:52:10 +0200 (Mon, 27 Aug 2007) | 2 lines News about functools.reduce. ........ r57611 | georg.brandl | 2007-08-28 10:29:08 +0200 (Tue, 28 Aug 2007) | 2 lines Document rev. 57574. ........ r57612 | sean.reifschneider | 2007-08-28 11:07:54 +0200 (Tue, 28 Aug 2007) | 2 lines Adding basic imputil documentation. ........ r57614 | georg.brandl | 2007-08-28 12:48:18 +0200 (Tue, 28 Aug 2007) | 2 lines Fix some glitches. ........ r57616 | lars.gustaebel | 2007-08-28 14:31:09 +0200 (Tue, 28 Aug 2007) | 5 lines TarFile.__init__() no longer fails if no name argument is passed and the fileobj argument has no usable name attribute (e.g. StringIO). (will backport to 2.5) ........ r57619 | thomas.wouters | 2007-08-28 17:28:19 +0200 (Tue, 28 Aug 2007) | 22 lines Improve extended slicing support in builtin types and classes. Specifically: - Specialcase extended slices that amount to a shallow copy the same way as is done for simple slices, in the tuple, string and unicode case. - Specialcase step-1 extended slices to optimize the common case for all involved types. - For lists, allow extended slice assignment of differing lengths as long as the step is 1. (Previously, 'l[:2:1] = []' failed even though 'l[:2] = []' and 'l[:2:None] = []' do not.) - Implement extended slicing for buffer, array, structseq, mmap and UserString.UserString. - Implement slice-object support (but not non-step-1 slice assignment) for UserString.MutableString. - Add tests for all new functionality. ........
346 lines
11 KiB
Python
346 lines
11 KiB
Python
from test.test_support import TESTFN, run_unittest
|
|
import mmap
|
|
import unittest
|
|
import os, re
|
|
|
|
PAGESIZE = mmap.PAGESIZE
|
|
|
|
class MmapTests(unittest.TestCase):
|
|
|
|
def setUp(self):
|
|
if os.path.exists(TESTFN):
|
|
os.unlink(TESTFN)
|
|
|
|
def tearDown(self):
|
|
try:
|
|
os.unlink(TESTFN)
|
|
except OSError:
|
|
pass
|
|
|
|
def test_basic(self):
|
|
# Test mmap module on Unix systems and Windows
|
|
|
|
# Create a file to be mmap'ed.
|
|
f = open(TESTFN, 'bw+')
|
|
try:
|
|
# Write 2 pages worth of data to the file
|
|
f.write(b'\0'* PAGESIZE)
|
|
f.write(b'foo')
|
|
f.write(b'\0'* (PAGESIZE-3) )
|
|
f.flush()
|
|
m = mmap.mmap(f.fileno(), 2 * PAGESIZE)
|
|
finally:
|
|
f.close()
|
|
|
|
# Simple sanity checks
|
|
|
|
tp = str(type(m)) # SF bug 128713: segfaulted on Linux
|
|
self.assertEqual(m.find('foo'), PAGESIZE)
|
|
|
|
self.assertEqual(len(m), 2*PAGESIZE)
|
|
|
|
self.assertEqual(m[0], b'\0')
|
|
self.assertEqual(m[0:3], b'\0\0\0')
|
|
|
|
# Modify the file's content
|
|
m[0] = b'3'
|
|
m[PAGESIZE +3: PAGESIZE +3+3] = b'bar'
|
|
|
|
# Check that the modification worked
|
|
self.assertEqual(m[0], b'3')
|
|
self.assertEqual(m[0:3], b'3\0\0')
|
|
self.assertEqual(m[PAGESIZE-1 : PAGESIZE + 7], b'\0foobar\0')
|
|
|
|
m.flush()
|
|
|
|
# Test doing a regular expression match in an mmap'ed file
|
|
match = re.search('[A-Za-z]+', m)
|
|
if match is None:
|
|
self.fail('regex match on mmap failed!')
|
|
else:
|
|
start, end = match.span(0)
|
|
length = end - start
|
|
|
|
self.assertEqual(start, PAGESIZE)
|
|
self.assertEqual(end, PAGESIZE + 6)
|
|
|
|
# test seeking around (try to overflow the seek implementation)
|
|
m.seek(0,0)
|
|
self.assertEqual(m.tell(), 0)
|
|
m.seek(42,1)
|
|
self.assertEqual(m.tell(), 42)
|
|
m.seek(0,2)
|
|
self.assertEqual(m.tell(), len(m))
|
|
|
|
# Try to seek to negative position...
|
|
self.assertRaises(ValueError, m.seek, -1)
|
|
|
|
# Try to seek beyond end of mmap...
|
|
self.assertRaises(ValueError, m.seek, 1, 2)
|
|
|
|
# Try to seek to negative position...
|
|
self.assertRaises(ValueError, m.seek, -len(m)-1, 2)
|
|
|
|
# Try resizing map
|
|
try:
|
|
m.resize(512)
|
|
except SystemError:
|
|
# resize() not supported
|
|
# No messages are printed, since the output of this test suite
|
|
# would then be different across platforms.
|
|
pass
|
|
else:
|
|
# resize() is supported
|
|
self.assertEqual(len(m), 512)
|
|
# Check that we can no longer seek beyond the new size.
|
|
self.assertRaises(ValueError, m.seek, 513, 0)
|
|
|
|
# Check that the underlying file is truncated too
|
|
# (bug #728515)
|
|
f = open(TESTFN)
|
|
try:
|
|
f.seek(0, 2)
|
|
self.assertEqual(f.tell(), 512)
|
|
finally:
|
|
f.close()
|
|
self.assertEqual(m.size(), 512)
|
|
|
|
m.close()
|
|
|
|
def test_access_parameter(self):
|
|
# Test for "access" keyword parameter
|
|
mapsize = 10
|
|
open(TESTFN, "wb").write(b"a"*mapsize)
|
|
f = open(TESTFN, "rb")
|
|
m = mmap.mmap(f.fileno(), mapsize, access=mmap.ACCESS_READ)
|
|
self.assertEqual(m[:], b'a'*mapsize, "Readonly memory map data incorrect.")
|
|
|
|
# Ensuring that readonly mmap can't be slice assigned
|
|
try:
|
|
m[:] = b'b'*mapsize
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
self.fail("Able to write to readonly memory map")
|
|
|
|
# Ensuring that readonly mmap can't be item assigned
|
|
try:
|
|
m[0] = b'b'
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
self.fail("Able to write to readonly memory map")
|
|
|
|
# Ensuring that readonly mmap can't be write() to
|
|
try:
|
|
m.seek(0,0)
|
|
m.write(b'abc')
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
self.fail("Able to write to readonly memory map")
|
|
|
|
# Ensuring that readonly mmap can't be write_byte() to
|
|
try:
|
|
m.seek(0,0)
|
|
m.write_byte(b'd')
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
self.fail("Able to write to readonly memory map")
|
|
|
|
# Ensuring that readonly mmap can't be resized
|
|
try:
|
|
m.resize(2*mapsize)
|
|
except SystemError: # resize is not universally supported
|
|
pass
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
self.fail("Able to resize readonly memory map")
|
|
del m, f
|
|
self.assertEqual(open(TESTFN, "rb").read(), b'a'*mapsize,
|
|
"Readonly memory map data file was modified")
|
|
|
|
# Opening mmap with size too big
|
|
import sys
|
|
f = open(TESTFN, "r+b")
|
|
try:
|
|
m = mmap.mmap(f.fileno(), mapsize+1)
|
|
except ValueError:
|
|
# we do not expect a ValueError on Windows
|
|
# CAUTION: This also changes the size of the file on disk, and
|
|
# later tests assume that the length hasn't changed. We need to
|
|
# repair that.
|
|
if sys.platform.startswith('win'):
|
|
self.fail("Opening mmap with size+1 should work on Windows.")
|
|
else:
|
|
# we expect a ValueError on Unix, but not on Windows
|
|
if not sys.platform.startswith('win'):
|
|
self.fail("Opening mmap with size+1 should raise ValueError.")
|
|
m.close()
|
|
f.close()
|
|
if sys.platform.startswith('win'):
|
|
# Repair damage from the resizing test.
|
|
f = open(TESTFN, 'r+b')
|
|
f.truncate(mapsize)
|
|
f.close()
|
|
|
|
# Opening mmap with access=ACCESS_WRITE
|
|
f = open(TESTFN, "r+b")
|
|
m = mmap.mmap(f.fileno(), mapsize, access=mmap.ACCESS_WRITE)
|
|
# Modifying write-through memory map
|
|
m[:] = b'c'*mapsize
|
|
self.assertEqual(m[:], b'c'*mapsize,
|
|
"Write-through memory map memory not updated properly.")
|
|
m.flush()
|
|
m.close()
|
|
f.close()
|
|
f = open(TESTFN, 'rb')
|
|
stuff = f.read()
|
|
f.close()
|
|
self.assertEqual(stuff, b'c'*mapsize,
|
|
"Write-through memory map data file not updated properly.")
|
|
|
|
# Opening mmap with access=ACCESS_COPY
|
|
f = open(TESTFN, "r+b")
|
|
m = mmap.mmap(f.fileno(), mapsize, access=mmap.ACCESS_COPY)
|
|
# Modifying copy-on-write memory map
|
|
m[:] = b'd'*mapsize
|
|
self.assertEqual(m[:], b'd' * mapsize,
|
|
"Copy-on-write memory map data not written correctly.")
|
|
m.flush()
|
|
self.assertEqual(open(TESTFN, "rb").read(), b'c'*mapsize,
|
|
"Copy-on-write test data file should not be modified.")
|
|
# Ensuring copy-on-write maps cannot be resized
|
|
self.assertRaises(TypeError, m.resize, 2*mapsize)
|
|
del m, f
|
|
|
|
# Ensuring invalid access parameter raises exception
|
|
f = open(TESTFN, "r+b")
|
|
self.assertRaises(ValueError, mmap.mmap, f.fileno(), mapsize, access=4)
|
|
f.close()
|
|
|
|
if os.name == "posix":
|
|
# Try incompatible flags, prot and access parameters.
|
|
f = open(TESTFN, "r+b")
|
|
self.assertRaises(ValueError, mmap.mmap, f.fileno(), mapsize,
|
|
flags=mmap.MAP_PRIVATE,
|
|
prot=mmap.PROT_READ, access=mmap.ACCESS_WRITE)
|
|
f.close()
|
|
|
|
def test_bad_file_desc(self):
|
|
# Try opening a bad file descriptor...
|
|
self.assertRaises(mmap.error, mmap.mmap, -2, 4096)
|
|
|
|
def test_tougher_find(self):
|
|
# Do a tougher .find() test. SF bug 515943 pointed out that, in 2.2,
|
|
# searching for data with embedded \0 bytes didn't work.
|
|
f = open(TESTFN, 'wb+')
|
|
|
|
data = b'aabaac\x00deef\x00\x00aa\x00'
|
|
n = len(data)
|
|
f.write(data)
|
|
f.flush()
|
|
m = mmap.mmap(f.fileno(), n)
|
|
f.close()
|
|
|
|
for start in range(n+1):
|
|
for finish in range(start, n+1):
|
|
slice = data[start : finish]
|
|
self.assertEqual(m.find(slice), data.find(slice))
|
|
self.assertEqual(m.find(slice + b'x'), -1)
|
|
m.close()
|
|
|
|
def test_double_close(self):
|
|
# make sure a double close doesn't crash on Solaris (Bug# 665913)
|
|
f = open(TESTFN, 'wb+')
|
|
|
|
f.write(2**16 * b'a') # Arbitrary character
|
|
f.close()
|
|
|
|
f = open(TESTFN)
|
|
mf = mmap.mmap(f.fileno(), 2**16, access=mmap.ACCESS_READ)
|
|
mf.close()
|
|
mf.close()
|
|
f.close()
|
|
|
|
def test_entire_file(self):
|
|
# test mapping of entire file by passing 0 for map length
|
|
if hasattr(os, "stat"):
|
|
f = open(TESTFN, "wb+")
|
|
|
|
f.write(2**16 * b'm') # Arbitrary character
|
|
f.close()
|
|
|
|
f = open(TESTFN, "rb+")
|
|
mf = mmap.mmap(f.fileno(), 0)
|
|
self.assertEqual(len(mf), 2**16, "Map size should equal file size.")
|
|
self.assertEqual(mf.read(2**16), 2**16 * b"m")
|
|
mf.close()
|
|
f.close()
|
|
|
|
def test_move(self):
|
|
# make move works everywhere (64-bit format problem earlier)
|
|
f = open(TESTFN, 'wb+')
|
|
|
|
f.write(b"ABCDEabcde") # Arbitrary character
|
|
f.flush()
|
|
|
|
mf = mmap.mmap(f.fileno(), 10)
|
|
mf.move(5, 0, 5)
|
|
self.assertEqual(mf[:], b"ABCDEABCDE", "Map move should have duplicated front 5")
|
|
mf.close()
|
|
f.close()
|
|
|
|
def test_anonymous(self):
|
|
# anonymous mmap.mmap(-1, PAGE)
|
|
m = mmap.mmap(-1, PAGESIZE)
|
|
for x in range(PAGESIZE):
|
|
self.assertEqual(m[x], b'\0', "anonymously mmap'ed contents should be zero")
|
|
|
|
b = bytes(1)
|
|
for x in range(PAGESIZE):
|
|
b[0] = x & 255
|
|
m[x] = b
|
|
self.assertEqual(m[x], b)
|
|
|
|
def test_extended_getslice(self):
|
|
# Test extended slicing by comparing with list slicing.
|
|
s = bytes(reversed(range(256)))
|
|
m = mmap.mmap(-1, len(s))
|
|
m[:] = s
|
|
self.assertEqual(m[:], s)
|
|
indices = (0, None, 1, 3, 19, 300, -1, -2, -31, -300)
|
|
for start in indices:
|
|
for stop in indices:
|
|
# Skip step 0 (invalid)
|
|
for step in indices[1:]:
|
|
self.assertEqual(m[start:stop:step],
|
|
s[start:stop:step])
|
|
|
|
def test_extended_set_del_slice(self):
|
|
# Test extended slicing by comparing with list slicing.
|
|
s = bytes(reversed(range(256)))
|
|
m = mmap.mmap(-1, len(s))
|
|
indices = (0, None, 1, 3, 19, 300, -1, -2, -31, -300)
|
|
for start in indices:
|
|
for stop in indices:
|
|
# Skip invalid step 0
|
|
for step in indices[1:]:
|
|
m[:] = s
|
|
self.assertEqual(m[:], s)
|
|
L = list(s)
|
|
# Make sure we have a slice of exactly the right length,
|
|
# but with different data.
|
|
data = L[start:stop:step]
|
|
data = bytes(reversed(data))
|
|
L[start:stop:step] = data
|
|
m[start:stop:step] = data
|
|
self.assertEquals(m[:], bytes(L))
|
|
|
|
def test_main():
|
|
run_unittest(MmapTests)
|
|
|
|
if __name__ == '__main__':
|
|
test_main()
|