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-26 09:10:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'development' into use_utils

Browse source
This commit is contained in:
yubiuser 2022-09-17 16:14:31 +02:00 • committed by GitHub
commit 2ff1fa1b85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 43 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

17
test/_ubuntu_18.Dockerfile
View file

@ -1,17 +0,0 @@
FROM buildpack-deps:bionic-scm
ENV GITDIR /etc/.pihole
ENV SCRIPTDIR /opt/pihole
RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
ADD . $GITDIR
RUN cp $GITDIR/advanced/Scripts/*.sh $GITDIR/gravity.sh $GITDIR/pihole $GITDIR/automated\ install/*.sh $SCRIPTDIR/
ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
RUN true && \
chmod +x $SCRIPTDIR/*
ENV SKIP_INSTALL true
ENV OS_CHECK_DOMAIN_NAME dev-supportedos.pi-hole.net
#sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \

1
test/setup.py
View file

@ -1,6 +1,7 @@
from setuptools import setup
setup(
py_modules=[],
setup_requires=['pytest-runner'],
tests_require=['pytest'],
)

8
test/test_any_automated_install.py
View file

@ -881,13 +881,17 @@ def test_FTL_binary_installed_and_responsive_no_errors(host):
source /opt/pihole/basic-install.sh
create_pihole_user
funcOutput=$(get_binary_name)
echo "development" > /etc/pihole/ftlbranch
binary="pihole-FTL${funcOutput##*pihole-FTL}"
theRest="${funcOutput%pihole-FTL*}"
FTLdetect "${binary}" "${theRest}"
pihole-FTL version
''')
version_check = host.run('''
VERSION=$(pihole-FTL version)
echo ${VERSION:0:1}
''')
expected_stdout = 'v'
assert expected_stdout in installed_binary.stdout
assert expected_stdout in version_check.stdout
def test_IPv6_only_link_local(host):

2
test/tox.centos_8.ini
View file

@ -1,5 +1,5 @@
[tox]
envlist = py38
envlist = py3
[testenv]
whitelist_externals = docker

2
test/tox.debian_10.ini
View file

@ -1,5 +1,5 @@
[tox]
envlist = py38
envlist = py3
[testenv]
whitelist_externals = docker

2
test/tox.debian_11.ini
View file

@ -1,5 +1,5 @@
[tox]
envlist = py38
envlist = py3
[testenv]
whitelist_externals = docker

2
test/tox.fedora_34.ini
View file

@ -1,5 +1,5 @@
[tox]
envlist = py38
envlist = py3
[testenv]
whitelist_externals = docker

8
test/tox.ubuntu_18.ini
View file

@ -1,8 +0,0 @@
[tox]
envlist = py38
[testenv]
whitelist_externals = docker
deps = -rrequirements.txt
commands = docker build -f _ubuntu_18.Dockerfile -t pytest_pihole:test_container ../
pytest {posargs:-vv -n auto} ./test_any_automated_install.py ./test_any_utils.py

2
test/tox.ubuntu_20.ini
View file

@ -1,5 +1,5 @@
[tox]
envlist = py38
envlist = py3
[testenv]
whitelist_externals = docker

2
test/tox.ubuntu_22.ini
View file

@ -1,5 +1,5 @@
[tox]
envlist = py38
envlist = py3
[testenv]
whitelist_externals = docker