openstack
/
keystone
Code Issues Proposed changes

Fix bindep.txt for python 3.11 job(Debian Bookworm) 

Python 3.11 job now run on Debian Bookwarm which does not provide
some of the packages in bindep. This fixes the bindep file so that
it pulls packages actually available.

This also updates a few assertions of log records in unit tests to make
these robust for any warning logs.

Change-Id: Iae3f4da24418530b61b9a0b64390160d194da05b
This commit is contained in:
Takashi Kajinami 2023-11-09 01:50:06 +09:00
parent 1a21fbae26
commit 24b77bb643
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bindep.txt
View File

@ -12,11 +12,13 @@ libsqlite3-dev [platform:dpkg]
libssl-dev [platform:dpkg]
libxml2-dev [platform:dpkg]
libxslt1-dev [platform:dpkg]
mysql-client [platform:dpkg]
mysql-server [platform:dpkg]
mysql-client [platform:dpkg !platform:debian]
mariadb-client [platform:debian]
mysql-server [platform:dpkg !platform:debian]
mariadb-server [platform:debian]
postgresql-client [platform:dpkg]
postgresql-server-dev-all [platform:dpkg]
python-all-dev [platform:dpkg]
python-all-dev [platform:dpkg !platform:debian]
python3-all-dev [platform:dpkg]
cyrus-sasl-devel [platform:rpm]

4
keystone/tests/unit/test_v3_federation.py
View File

@ -4367,7 +4367,7 @@ class SAMLGenerationTests(test_v3.RestfulTestCase):
self.signed_assertion)
expected_log = (
'Error when signing assertion, reason: %s\n' % exception_msg)
self.assertEqual(expected_log, logger_fixture.output)
self.assertIn(expected_log, logger_fixture.output)
def test_sign_assertion_logs_message_if_xmlsec1_is_not_installed(self):
with mock.patch.object(subprocess, 'check_output') as co_mock:
@ -4383,7 +4383,7 @@ class SAMLGenerationTests(test_v3.RestfulTestCase):
expected_log = ('Unable to locate xmlsec1 binary on the system. '
'Check to make sure it is installed.\n')
self.assertEqual(expected_log, logger_fixture.output)
self.assertIn(expected_log, logger_fixture.output)
class IdPMetadataGenerationTests(test_v3.RestfulTestCase):