From 85d033089f0e09e1ab925e3cec56c8f00ef775fb 2023-08-10 00:04:24 From: Branko Majic Date: 2023-08-10 00:04:24 Subject: [PATCH] MAR-181: Remove release-specific code for database role tests: - Code was present due to difference between Debian Stretch and Debian Buster. --- diff --git a/roles/database/molecule/default/tests/test_default.py b/roles/database/molecule/default/tests/test_default.py index 5c2340e94c4dc8e74fa5670deb31e1b31c4f4412..e891aaa6da5edeb34e554c7e36b2985d9877cc31 100644 --- a/roles/database/molecule/default/tests/test_default.py +++ b/roles/database/molecule/default/tests/test_default.py @@ -34,16 +34,8 @@ def test_database_user_permissions(host): Tests if database user has been granted correct permissions on the database. """ - ansible_facts = host.ansible("setup")["ansible_facts"] - ansible_distribution_release = ansible_facts['ansible_distribution_release'] - - # Small difference in usage of backtick (`) instead of single - # quote (') when displaying grants for user. - if ansible_distribution_release == "buster": - expected_usage = "GRANT USAGE ON *.* TO `testdb`@`localhost` IDENTIFIED BY PASSWORD '*676852B7FAE972722AD20D6E74781D6B1A100544'" - expected_privileges = "GRANT ALL PRIVILEGES ON `testdb`.* TO `testdb`@`localhost`" - else: - raise Exception("Tried running test on unsupported distribution: %s" % ansible_distribution_release) + expected_usage = "GRANT USAGE ON *.* TO `testdb`@`localhost` IDENTIFIED BY PASSWORD '*676852B7FAE972722AD20D6E74781D6B1A100544'" + expected_privileges = "GRANT ALL PRIVILEGES ON `testdb`.* TO `testdb`@`localhost`" visible_databases = host.run("mysql -utestdb -ptestdbpassword -BNe 'show databases'")