Skip to content
Snippets Groups Projects
Commit 862982b7 authored by Simon McVittie's avatar Simon McVittie
Browse files

tests: Work around libldap-2.4.so.2 not loading successfully on Arch


Workaround for T21931. Fully fixing this is low-priority, because we
have been removing libldap dependencies anyway.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent dd2867be
No related branches found
No related tags found
No related merge requests found
...@@ -363,13 +363,14 @@ class TestInsideScout(BaseTest): ...@@ -363,13 +363,14 @@ class TestInsideScout(BaseTest):
arch=multiarch, arch=multiarch,
): ):
self.assertTrue(arch_info['can-run']) self.assertTrue(arch_info['can-run'])
self.assertEqual([], arch_info['library-issues-summary'])
# Graphics driver support depends on the host system, so we # Graphics driver support depends on the host system, so we
# don't assert that everything is fine, only that we have # don't assert that everything is fine, only that we have
# the information. # the information.
self.assertIn('graphics-details', arch_info) self.assertIn('graphics-details', arch_info)
self.assertIn('glx/gl', arch_info['graphics-details']) self.assertIn('glx/gl', arch_info['graphics-details'])
expect_library_issues = set()
for soname, details in arch_info['library-details'].items(): for soname, details in arch_info['library-details'].items():
with self.catch( with self.catch(
'per-library information', 'per-library information',
...@@ -377,6 +378,15 @@ class TestInsideScout(BaseTest): ...@@ -377,6 +378,15 @@ class TestInsideScout(BaseTest):
arch=multiarch, arch=multiarch,
soname=soname, soname=soname,
): ):
if soname == 'libldap-2.4.so.2':
# On Debian, libldap-2.4.so.2 is really an alias
# for libldap_r-2.4.so.2; but on Arch Linux they
# are separate libraries, and this causes trouble
# for our library-loading. Ignore failure to load
# the former.
expect_library_issues |= set(details.get('issues', []))
continue
self.assertIn('path', details) self.assertIn('path', details)
self.assertEqual( self.assertEqual(
[], [],
...@@ -521,6 +531,16 @@ class TestInsideScout(BaseTest): ...@@ -521,6 +531,16 @@ class TestInsideScout(BaseTest):
details.get(key), details.get(key),
) )
with self.catch(
'per-architecture information',
diagnostic=arch_info,
arch=multiarch,
):
self.assertEqual(
expect_library_issues,
set(arch_info['library-issues-summary']),
)
if __name__ == '__main__': if __name__ == '__main__':
assert sys.version_info >= (3, 5), 'Python 3.5+ is required' assert sys.version_info >= (3, 5), 'Python 3.5+ is required'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment