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-14 19:39:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

reduce the amount of strict not in checks

Browse source 
Signed-off-by: Adam Hill <adam@diginc.us>
This commit is contained in:
Adam Hill 2018-07-11 23:25:08 -05:00
parent 88e4b6390c
commit 449b7bf6e4
No known key found for this signature in database
GPG key ID: 2193804FCA429855
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
test/README.md
View file

@ -10,4 +10,3 @@ From command line all you need to do is:
# How do I debug python? # How do I debug python?
Highly recommended: Setup PyCharm on a **Docker enabled** machine. Having a python debugger like PyCharm changes your life if you've never used it :) Highly recommended: Setup PyCharm on a **Docker enabled** machine. Having a python debugger like PyCharm changes your life if you've never used it :)

15
test/test_centos_fedora_support.py
View file

@ -1,4 +1,5 @@
import pytest import pytest
import re
from conftest import ( from conftest import (
tick_box, tick_box,
info_box, info_box,
@ -18,14 +19,8 @@ def test_epel_and_remi_not_installed_fedora(Pihole):
source /opt/pihole/basic-install.sh source /opt/pihole/basic-install.sh
distro_check distro_check
''') ''')
expected_stdout = info_box + (' Enabling EPEL package repository ' assert distro_check.stdout == ''
'(https://fedoraproject.org/wiki/EPEL)')
assert expected_stdout not in distro_check.stdout
expected_stdout = tick_box + ' Installed epel-release'
assert expected_stdout not in distro_check.stdout
expected_stdout = info_box + (' User opt-out of PHP 7 upgrade on CentOS. '
'Deprecated PHP may be in use.')
assert expected_stdout not in distro_check.stdout
epel_package = Pihole.package('epel-release') epel_package = Pihole.package('epel-release')
assert not epel_package.is_installed assert not epel_package.is_installed
remi_package = Pihole.package('remi-release') remi_package = Pihole.package('remi-release')
@ -121,9 +116,7 @@ def test_php_upgrade_user_optin_centos(Pihole):
source /opt/pihole/basic-install.sh source /opt/pihole/basic-install.sh
distro_check distro_check
''') ''')
expected_stdout = info_box + (' User opt-out of PHP 7 upgrade on CentOS. ' assert 'opt-out' not in distro_check.stdout
'Deprecated PHP may be in use.')
assert expected_stdout not in distro_check.stdout
expected_stdout = info_box + (' Enabling Remi\'s RPM repository ' expected_stdout = info_box + (' Enabling Remi\'s RPM repository '
'(https://rpms.remirepo.net)') '(https://rpms.remirepo.net)')
assert expected_stdout in distro_check.stdout assert expected_stdout in distro_check.stdout