diff --git a/roles/common/molecule/default/tests/test_parameters_optional.py b/roles/common/molecule/default/tests/test_parameters_optional.py index 2044e34ea6e49625bcc199d30a46132d8bb959ec..6b730003f8bcf320a56a42e381f027be9d7ee728 100644 --- a/roles/common/molecule/default/tests/test_parameters_optional.py +++ b/roles/common/molecule/default/tests/test_parameters_optional.py @@ -41,18 +41,9 @@ def test_common_installed_packages_common(host): Tests that user-provided common packages have been installed. """ - debian_release = host.ansible("setup")["ansible_facts"]["ansible_distribution_release"] - assert host.package('units').is_installed assert host.package('gnutls-bin').is_installed - - # Different name of package in different Debian releases. - if debian_release == 'jessie': - assert host.package('libmariadb-client-lgpl-dev-compat').is_installed - elif debian_release == 'stretch': - assert host.package('libmariadbclient-dev-compat').is_installed - else: - raise Exception("Cannot run this test on debian release: %s" % debian_release) + assert host.package('libmariadbclient-dev-compat').is_installed def test_ssh_login_mechanisms(host): @@ -75,21 +66,6 @@ def test_ssh_login_mechanisms(host): assert err.allowed_types == ['publickey'] -def test_mariadb_mysql_config_symlink(host): - """ - Tests if symbolic link has been set-up for mariadb_config binary to be - accessible as mysql_config as well. - - Only applicable to Debian Jessie. - """ - - if host.ansible("setup")["ansible_facts"]["ansible_distribution_release"] == 'jessie': - mysql_config = host.file('/usr/bin/mysql_config') - - assert mysql_config.is_symlink - assert mysql_config.linked_to == '/usr/bin/mariadb_config' - - def test_emacs_electric_indent_mode(host): """ Tests if Emacs electric indent mode has been disabled via custom