rename select_rpm_php and simplify it to remove code no longer needed (discussed internally removing the unsupported dialog here to match behaviour on non rpm distros)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
Adam Warner
2022-07-30 16:19:40 +01:00
parent 9c03915cb0
commit b613758419
5 changed files with 11 additions and 53 deletions
+2 -2
View File
@@ -1117,7 +1117,7 @@ def test_package_manager_has_pihole_deps(host):
output = host.run('''
source /opt/pihole/basic-install.sh
package_manager_detect
select_rpm_php
check_epel_repo_required
install_dependent_packages ${PIHOLE_DEPS[@]}
''')
@@ -1131,7 +1131,7 @@ def test_package_manager_has_web_deps(host):
output = host.run('''
source /opt/pihole/basic-install.sh
package_manager_detect
select_rpm_php
check_epel_repo_required
install_dependent_packages ${PIHOLE_WEB_DEPS[@]}
''')
+3 -3
View File
@@ -13,7 +13,7 @@ def test_php_upgrade_default_continue_centos_gte_8(host):
package_manager_detect = host.run('''
source /opt/pihole/basic-install.sh
package_manager_detect
select_rpm_php
check_epel_repo_required
''')
unexpected_stdout = info_box + (' User opt-out of PHP 7 upgrade on CentOS.'
' Deprecated PHP may be in use.')
@@ -34,7 +34,7 @@ def test_php_upgrade_user_optout_skipped_centos_gte_8(host):
package_manager_detect = host.run('''
source /opt/pihole/basic-install.sh
package_manager_detect
select_rpm_php
check_epel_repo_required
''')
unexpected_stdout = info_box + (' User opt-out of PHP 7 upgrade on CentOS.'
' Deprecated PHP may be in use.')
@@ -55,7 +55,7 @@ def test_php_upgrade_user_optin_skipped_centos_gte_8(host):
package_manager_detect = host.run('''
source /opt/pihole/basic-install.sh
package_manager_detect
select_rpm_php
check_epel_repo_required
''')
assert 'opt-out' not in package_manager_detect.stdout
unexpected_stdout = info_box + (' Enabling Remi\'s RPM repository '
+1 -1
View File
@@ -14,7 +14,7 @@ def test_enable_epel_repository_centos(host):
package_manager_detect = host.run('''
source /opt/pihole/basic-install.sh
package_manager_detect
select_rpm_php
check_epel_repo_required
''')
expected_stdout = info_box + (' Enabling EPEL package repository '
'(https://fedoraproject.org/wiki/EPEL)')
+1 -1
View File
@@ -6,7 +6,7 @@ def test_epel_and_remi_not_installed_fedora(host):
package_manager_detect = host.run('''
source /opt/pihole/basic-install.sh
package_manager_detect
select_rpm_php
check_epel_repo_required
''')
assert package_manager_detect.stdout == ''