merge r68768 to py3k

This commit is contained in:
Jesse Noller 2009-01-19 16:23:53 +00:00
parent 7aedf11e57
commit 6214edd1bb
4 changed files with 33 additions and 3 deletions

View file

@ -62,6 +62,8 @@ else:
HAVE_GETVALUE = not getattr(_multiprocessing,
'HAVE_BROKEN_SEM_GETVALUE', False)
WIN32 = (sys.platform == "win32")
#
# Creates a wrapper for a function which records the time it takes to finish
#
@ -1683,6 +1685,18 @@ class _TestLogging(BaseTestCase):
logger.setLevel(level=LOG_LEVEL)
#
# Test to verify handle verification, see issue 3321
#
class TestInvalidHandle(unittest.TestCase):
def test_invalid_handles(self):
if WIN32:
return
conn = _multiprocessing.Connection(44977608)
self.assertRaises(IOError, conn.poll)
self.assertRaises(IOError, _multiprocessing.Connection, -1)
#
# Functions used to create test cases from the base ones in this module
#
@ -1786,7 +1800,7 @@ class OtherTest(unittest.TestCase):
multiprocessing.connection.answer_challenge,
_FakeConnection(), b'abc')
testcases_other = [OtherTest]
testcases_other = [OtherTest, TestInvalidHandle]
#
#