Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-04-21 23:00:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move code from check_epel_repo_required into the rpm branch of the if check on package_manager_detect(), adjust tests to accommodate

Browse source 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
Adam Warner 2022-07-30 19:18:33 +01:00
parent 0e8c1ec023
commit 9028898ba7
No known key found for this signature in database
GPG key ID: 872950F3ECF2B173
4 changed files with 18 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/test_any_automated_install.py
View file

@ -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