Skip to content

Commit 804ea2d

Browse files
authored
gh-91265: Make old ctypes.macholib tests runned by python -m test (gh-32094)
* Move tests from ctypes.macholib.dy* to ctypes.test
1 parent 4c3b283 commit 804ea2d

File tree

5 files changed

+47
-52
lines changed

5 files changed

+47
-52
lines changed

Lib/ctypes/macholib/dyld.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,3 @@ def framework_find(fn, executable_path=None, env=None):
163163
raise error
164164
finally:
165165
error = None
166-
167-
def test_dyld_find():
168-
env = {}
169-
assert dyld_find('libSystem.dylib') == '/usr/lib/libSystem.dylib'
170-
assert dyld_find('System.framework/System') == '/System/Library/Frameworks/System.framework/System'
171-
172-
if __name__ == '__main__':
173-
test_dyld_find()

Lib/ctypes/macholib/dylib.py

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -40,24 +40,3 @@ def dylib_info(filename):
4040
if not is_dylib:
4141
return None
4242
return is_dylib.groupdict()
43-
44-
45-
def test_dylib_info():
46-
def d(location=None, name=None, shortname=None, version=None, suffix=None):
47-
return dict(
48-
location=location,
49-
name=name,
50-
shortname=shortname,
51-
version=version,
52-
suffix=suffix
53-
)
54-
assert dylib_info('completely/invalid') is None
55-
assert dylib_info('completely/invalide_debug') is None
56-
assert dylib_info('P/Foo.dylib') == d('P', 'Foo.dylib', 'Foo')
57-
assert dylib_info('P/Foo_debug.dylib') == d('P', 'Foo_debug.dylib', 'Foo', suffix='debug')
58-
assert dylib_info('P/Foo.A.dylib') == d('P', 'Foo.A.dylib', 'Foo', 'A')
59-
assert dylib_info('P/Foo_debug.A.dylib') == d('P', 'Foo_debug.A.dylib', 'Foo_debug', 'A')
60-
assert dylib_info('P/Foo.A_debug.dylib') == d('P', 'Foo.A_debug.dylib', 'Foo', 'A', 'debug')
61-
62-
if __name__ == '__main__':
63-
test_dylib_info()

Lib/ctypes/macholib/framework.py

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -40,26 +40,3 @@ def framework_info(filename):
4040
if not is_framework:
4141
return None
4242
return is_framework.groupdict()
43-
44-
def test_framework_info():
45-
def d(location=None, name=None, shortname=None, version=None, suffix=None):
46-
return dict(
47-
location=location,
48-
name=name,
49-
shortname=shortname,
50-
version=version,
51-
suffix=suffix
52-
)
53-
assert framework_info('completely/invalid') is None
54-
assert framework_info('completely/invalid/_debug') is None
55-
assert framework_info('P/F.framework') is None
56-
assert framework_info('P/F.framework/_debug') is None
57-
assert framework_info('P/F.framework/F') == d('P', 'F.framework/F', 'F')
58-
assert framework_info('P/F.framework/F_debug') == d('P', 'F.framework/F_debug', 'F', suffix='debug')
59-
assert framework_info('P/F.framework/Versions') is None
60-
assert framework_info('P/F.framework/Versions/A') is None
61-
assert framework_info('P/F.framework/Versions/A/F') == d('P', 'F.framework/Versions/A/F', 'F', 'A')
62-
assert framework_info('P/F.framework/Versions/A/F_debug') == d('P', 'F.framework/Versions/A/F_debug', 'F', 'A', 'debug')
63-
64-
if __name__ == '__main__':
65-
test_framework_info()

Lib/ctypes/test/test_macholib.py

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
# -bob
3333

3434
from ctypes.macholib.dyld import dyld_find
35+
from ctypes.macholib.dylib import dylib_info
36+
from ctypes.macholib.framework import framework_info
3537

3638
def find_lib(name):
3739
possible = ['lib'+name+'.dylib', name+'.dylib', name+'.framework/'+name]
@@ -42,9 +44,20 @@ def find_lib(name):
4244
pass
4345
raise ValueError("%s not found" % (name,))
4446

47+
48+
def d(location=None, name=None, shortname=None, version=None, suffix=None):
49+
return {'location': location, 'name': name, 'shortname': shortname,
50+
'version': version, 'suffix': suffix}
51+
52+
4553
class MachOTest(unittest.TestCase):
4654
@unittest.skipUnless(sys.platform == "darwin", 'OSX-specific test')
4755
def test_find(self):
56+
self.assertEqual(dyld_find('libSystem.dylib'),
57+
'/usr/lib/libSystem.dylib')
58+
self.assertEqual(dyld_find('System.framework/System'),
59+
'/System/Library/Frameworks/System.framework/System')
60+
4861
# On Mac OS 11, system dylibs are only present in the shared cache,
4962
# so symlinks like libpthread.dylib -> libSystem.B.dylib will not
5063
# be resolved by dyld_find
@@ -62,5 +75,36 @@ def test_find(self):
6275
('/System/Library/Frameworks/IOKit.framework/Versions/A/IOKit',
6376
'/System/Library/Frameworks/IOKit.framework/IOKit'))
6477

78+
@unittest.skipUnless(sys.platform == "darwin", 'OSX-specific test')
79+
def test_info(self):
80+
self.assertIsNone(dylib_info('completely/invalid'))
81+
self.assertIsNone(dylib_info('completely/invalide_debug'))
82+
self.assertEqual(dylib_info('P/Foo.dylib'), d('P', 'Foo.dylib', 'Foo'))
83+
self.assertEqual(dylib_info('P/Foo_debug.dylib'),
84+
d('P', 'Foo_debug.dylib', 'Foo', suffix='debug'))
85+
self.assertEqual(dylib_info('P/Foo.A.dylib'),
86+
d('P', 'Foo.A.dylib', 'Foo', 'A'))
87+
self.assertEqual(dylib_info('P/Foo_debug.A.dylib'),
88+
d('P', 'Foo_debug.A.dylib', 'Foo_debug', 'A'))
89+
self.assertEqual(dylib_info('P/Foo.A_debug.dylib'),
90+
d('P', 'Foo.A_debug.dylib', 'Foo', 'A', 'debug'))
91+
92+
@unittest.skipUnless(sys.platform == "darwin", 'OSX-specific test')
93+
def test_framework_info(self):
94+
self.assertIsNone(framework_info('completely/invalid'))
95+
self.assertIsNone(framework_info('completely/invalid/_debug'))
96+
self.assertIsNone(framework_info('P/F.framework'))
97+
self.assertIsNone(framework_info('P/F.framework/_debug'))
98+
self.assertEqual(framework_info('P/F.framework/F'),
99+
d('P', 'F.framework/F', 'F'))
100+
self.assertEqual(framework_info('P/F.framework/F_debug'),
101+
d('P', 'F.framework/F_debug', 'F', suffix='debug'))
102+
self.assertIsNone(framework_info('P/F.framework/Versions'))
103+
self.assertIsNone(framework_info('P/F.framework/Versions/A'))
104+
self.assertEqual(framework_info('P/F.framework/Versions/A/F'),
105+
d('P', 'F.framework/Versions/A/F', 'F', 'A'))
106+
self.assertEqual(framework_info('P/F.framework/Versions/A/F_debug'),
107+
d('P', 'F.framework/Versions/A/F_debug', 'F', 'A', 'debug'))
108+
65109
if __name__ == "__main__":
66110
unittest.main()
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Test for :mod:`ctypes.macholib.dyld`, :mod:`ctypes.macholib.dylib`, and
2+
:mod:`ctypes.macholib.framework` are brought from manual pre-:mod:`unittest`
3+
times to :mod:`ctypes.test` location and structure. Patch by Oleg Iarygin.

0 commit comments

Comments
 (0)