mirror of
https://github.com/pi-hole/pi-hole.git
synced 2025-01-23 21:09:48 +00:00
appease stickler-ci
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
parent
44d020a54c
commit
d1539335bc
6 changed files with 3 additions and 17 deletions
|
@ -153,4 +153,4 @@ def mock_command_2(script, args, container):
|
||||||
def run_script(Pihole, script):
|
def run_script(Pihole, script):
|
||||||
result = Pihole.run(script)
|
result = Pihole.run(script)
|
||||||
assert result.rc == 0
|
assert result.rc == 0
|
||||||
return result
|
return result
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
import pytest
|
|
||||||
from .conftest import (
|
from .conftest import (
|
||||||
tick_box,
|
tick_box,
|
||||||
info_box,
|
info_box,
|
||||||
cross_box,
|
|
||||||
mock_command,
|
mock_command,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
import pytest
|
|
||||||
from .conftest import (
|
from .conftest import (
|
||||||
tick_box,
|
tick_box,
|
||||||
info_box,
|
info_box,
|
||||||
cross_box,
|
|
||||||
mock_command,
|
mock_command,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -117,4 +117,4 @@ def test_php_version_lt_7_detected_upgrade_user_optin_centos(Pihole):
|
||||||
assert remi_package.is_installed
|
assert remi_package.is_installed
|
||||||
updated_php_package = Pihole.package('php')
|
updated_php_package = Pihole.package('php')
|
||||||
updated_php_version = updated_php_package.version.split('.')[0]
|
updated_php_version = updated_php_package.version.split('.')[0]
|
||||||
assert int(updated_php_version) == 7
|
assert int(updated_php_version) == 7
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
import pytest
|
|
||||||
from .conftest import (
|
from .conftest import (
|
||||||
tick_box,
|
tick_box,
|
||||||
info_box,
|
|
||||||
cross_box,
|
cross_box,
|
||||||
mock_command,
|
mock_command,
|
||||||
)
|
)
|
||||||
|
@ -52,6 +50,7 @@ def test_selinux_permissive(Pihole):
|
||||||
assert expected_stdout in check_selinux.stdout
|
assert expected_stdout in check_selinux.stdout
|
||||||
assert check_selinux.rc == 0
|
assert check_selinux.rc == 0
|
||||||
|
|
||||||
|
|
||||||
def test_selinux_disabled(Pihole):
|
def test_selinux_disabled(Pihole):
|
||||||
'''
|
'''
|
||||||
confirms installer continues when SELinux is Disabled
|
confirms installer continues when SELinux is Disabled
|
||||||
|
|
|
@ -1,12 +1,3 @@
|
||||||
import pytest
|
|
||||||
from .conftest import (
|
|
||||||
tick_box,
|
|
||||||
info_box,
|
|
||||||
cross_box,
|
|
||||||
mock_command,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def test_epel_and_remi_not_installed_fedora(Pihole):
|
def test_epel_and_remi_not_installed_fedora(Pihole):
|
||||||
'''
|
'''
|
||||||
confirms installer does not attempt to install EPEL/REMI repositories
|
confirms installer does not attempt to install EPEL/REMI repositories
|
||||||
|
|
Loading…
Add table
Reference in a new issue