traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Partial revert of r80556 (Issue #7449, part 5, fix ctypes test) 

Rewrite r80556: the thread test have to be executed just after the test on
libc_open() and so the test cannot be splitted in two functions (without
duplicating code, and I don't want to duplicate code).
This commit is contained in:
Victor Stinner 2010-04-27 23:33:58 +00:00
parent a44b5a3326
commit 47c884129d
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Lib/ctypes/test/test_errno.py
View File

@ -7,11 +7,11 @@ try:
except ImportError: except ImportError:
threading = None threading = None
libc_name = find_library("c")
class Test(unittest.TestCase): class Test(unittest.TestCase):
@unittest.skipUnless(libc_name, 'Unable to find the C library')
def test_open(self): def test_open(self):
libc_name = find_library("c")
if libc_name is None:
raise unittest.SkipTest("Unable to find C library")
libc = CDLL(libc_name, use_errno=True) libc = CDLL(libc_name, use_errno=True)
if os.name == "nt": if os.name == "nt":
libc_open = libc._open libc_open = libc._open
@ -26,30 +26,26 @@ class Test(unittest.TestCase):
self.assertEqual(set_errno(32), errno.ENOENT) self.assertEqual(set_errno(32), errno.ENOENT)
self.assertEqual(get_errno(), 32) self.assertEqual(get_errno(), 32)
@unittest.skipUnless(libc_name, 'Unable to find the C library') if threading:
@unittest.skipUnless(threading, 'This test requires threading.') def _worker():
def test_open_thread(self): set_errno(0)
self.assertEqual(set_errno(32), errno.ENOENT)
def _worker(): libc = CDLL(libc_name, use_errno=False)
if os.name == "nt":
libc_open = libc._open
else:
libc_open = libc.open
libc_open.argtypes = c_char_p, c_int
self.assertEqual(libc_open("", 0), -1)
self.assertEqual(get_errno(), 0)
t = threading.Thread(target=_worker)
t.start()
t.join()
self.assertEqual(get_errno(), 32)
set_errno(0) set_errno(0)
libc = CDLL(libc_name, use_errno=False)
if os.name == "nt":
libc_open = libc._open
else:
libc_open = libc.open
libc_open.argtypes = c_char_p, c_int
self.assertEqual(libc_open("", 0), -1)
self.assertEqual(get_errno(), 0)
t = threading.Thread(target=_worker)
t.start()
t.join()
self.assertEqual(get_errno(), 32)
set_errno(0)
@unittest.skipUnless(os.name == "nt", 'Test specific to Windows') @unittest.skipUnless(os.name == "nt", 'Test specific to Windows')
def test_GetLastError(self): def test_GetLastError(self):
dll = WinDLL("kernel32", use_last_error=True) dll = WinDLL("kernel32", use_last_error=True)