diff options
| author | Adam Warner <me@adamwarner.co.uk> | 2022-07-30 21:18:33 +0300 |
|---|---|---|
| committer | Adam Warner <me@adamwarner.co.uk> | 2022-07-30 21:27:00 +0300 |
| commit | 9028898ba7b21cc8ca3838e9e68b5f6fe178af22 (patch) | |
| tree | 1250badaa36eba0c4b2df6f23bc51f1819419460 /test | |
| parent | 0e8c1ec023f5b684c48ef1853e0ab33dffc4afac (diff) | |
Move code from `check_epel_repo_required` into the rpm branch of the if check on package_manager_detect(), adjust tests to accommodatecentos7-can-do-one
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_any_automated_install.py | 8 | ||||
| -rw-r--r-- | test/test_centos_common_support.py | 1 | ||||
| -rw-r--r-- | test/test_fedora_support.py | 3 |
3 files changed, 3 insertions, 9 deletions
diff --git a/test/test_any_automated_install.py b/test/test_any_automated_install.py index 15608050..717f6ea2 100644 --- a/test/test_any_automated_install.py +++ b/test/test_any_automated_install.py @@ -1107,7 +1107,7 @@ def test_package_manager_has_installer_deps(host): install_dependent_packages ${INSTALLER_DEPS[@]} ''') - assert 'No package' not in output.stdout # centos7 still exits 0... + assert 'No package' not in output.stdout assert output.rc == 0 @@ -1117,11 +1117,10 @@ def test_package_manager_has_pihole_deps(host): output = host.run(''' source /opt/pihole/basic-install.sh package_manager_detect - check_epel_repo_required install_dependent_packages ${PIHOLE_DEPS[@]} ''') - assert 'No package' not in output.stdout # centos7 still exits 0... + assert 'No package' not in output.stdout assert output.rc == 0 @@ -1131,9 +1130,8 @@ def test_package_manager_has_web_deps(host): output = host.run(''' source /opt/pihole/basic-install.sh package_manager_detect - check_epel_repo_required install_dependent_packages ${PIHOLE_WEB_DEPS[@]} ''') - assert 'No package' not in output.stdout # centos7 still exits 0... + assert 'No package' not in output.stdout assert output.rc == 0 diff --git a/test/test_centos_common_support.py b/test/test_centos_common_support.py index 4be29c65..3497267a 100644 --- a/test/test_centos_common_support.py +++ b/test/test_centos_common_support.py @@ -14,7 +14,6 @@ def test_enable_epel_repository_centos(host): package_manager_detect = host.run(''' source /opt/pihole/basic-install.sh package_manager_detect - check_epel_repo_required ''') expected_stdout = info_box + (' Enabling EPEL package repository ' '(https://fedoraproject.org/wiki/EPEL)') diff --git a/test/test_fedora_support.py b/test/test_fedora_support.py index 45a7c2eb..57a6c5c4 100644 --- a/test/test_fedora_support.py +++ b/test/test_fedora_support.py @@ -6,11 +6,8 @@ def test_epel_and_remi_not_installed_fedora(host): package_manager_detect = host.run(''' source /opt/pihole/basic-install.sh package_manager_detect - check_epel_repo_required ''') assert package_manager_detect.stdout == '' epel_package = host.package('epel-release') assert not epel_package.is_installed - remi_package = host.package('remi-release') - assert not remi_package.is_installed |